增加客服系统yapi初稿，字段还未确定

src/main/java/cn/quantgroup/customer/model/order/EarlySettleUpOrder.java

+package cn.quantgroup.customer.model.order;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author yangjun
+ * @Date 2020/4/13 17:37
+ * @Desc
+ * @Update
+ */
+@Data
+public class EarlySettleUpOrder {
+    private Long loanId;
+    private String phoneNo;
+    private BigDecimal loanAmount;
+    private String fundOrderNo;
+    private Long fundId;
+    private String fundName;
+    private String channelOrderNo;
+    private Long channelId;
+    private String channelName;
+    private Integer allTerm;
+    private Integer noPaidTerm;
+    private Boolean showEntryFlag;
+    private Boolean hideEntryFlag;
+
+}

src/main/java/cn/quantgroup/customer/model/order/EarlySettleUpTrial.java

+package cn.quantgroup.customer.model.order;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author yangjun
+ * @Date 2020/4/13 17:37
+ * @Desc
+ * @Update
+ */
+@Data
+public class EarlySettleUpTrial {
+
+    private BigDecimal principal;
+    private BigDecimal interest;
+    private BigDecimal overdueInterest;
+    private BigDecimal otherFee;
+    private BigDecimal liquid;
+    private BigDecimal serviceFee;
+
+}

src/main/java/cn/quantgroup/customer/model/order/OperateLog.java

+package cn.quantgroup.customer.model.order;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+
+/**
+ * @author yangjun
+ * @Date 2020/4/13 17:37
+ * @Desc
+ * @Update
+ */
+@Data
+public class OperateLog {
+
+    private Timestamp createAt;
+    private String name;
+    private String opName;
+    private String remark;
+    private String account;
+
+}

src/main/java/cn/quantgroup/customer/rest/OrderRest.java

 package cn.quantgroup.customer.rest;
 
+import cn.quantgroup.customer.rest.param.ordermapping.EarlySettleUpOrderQueryParam;
+import cn.quantgroup.customer.rest.param.ordermapping.OperateEntryParam;
 import cn.quantgroup.customer.rest.param.ordermapping.OrderQueryParam;
 import cn.quantgroup.customer.rest.param.repay.RepayOrderInfoQuery;
 import cn.quantgroup.customer.rest.vo.JsonResult;
@@ -46,4 +48,48 @@ public class OrderRest {
         log.info("[查询订单信息],请求参数:orderQuery={}", orderQuery);
         return orderService.queryOrderInfo(orderQuery);
     }
+
+    /**
+     * 订单提前一次性结清查询
+     * @param orderQuery
+     * @return
+     */
+    @GetMapping("/queryEarlySettleUpOrders")
+    public JsonResult queryEarlySettleUpOrders(EarlySettleUpOrderQueryParam orderQuery) {
+        log.info("[订单提前一次性结清查询],请求参数:orderQuery={}", orderQuery);
+        return orderService.queryEarlySettleUpOrders(orderQuery);
+    }
+
+    /**
+     * 显示/隐藏结清入口操作
+     * @param operateEntryParam
+     * @return
+     */
+    @PostMapping("/operateEntry")
+    public JsonResult operateEntry(OperateEntryParam operateEntryParam) {
+        log.info("[显示/隐藏结清入口操作],请求参数:operateEntryParam={}", operateEntryParam);
+        return orderService.operateEntry(operateEntryParam);
+    }
+
+    /**
+     * 提前一次性结清金额试算
+     * @param loanId
+     * @return
+     */
+    @GetMapping("/earlySettleUpTrial/{loanId}")
+    public JsonResult earlySettleUpTrial(@PathVariable Long loanId) {
+        log.info("[提前一次性结清金额试算],请求参数:loanId={}", loanId);
+        return orderService.earlySettleUpTrial(loanId);
+    }
+
+    /**
+     * 操作日志查询
+     * @param loanId
+     * @return
+     */
+    @GetMapping("/queryOperateLog/{loanId}")
+    public JsonResult queryOperateLog(@PathVariable Long loanId) {
+        log.info("[操作日志查询],请求参数:loanId={}", loanId);
+        return orderService.queryOperateLog(loanId);
+    }
 }

src/main/java/cn/quantgroup/customer/rest/param/ordermapping/EarlySettleUpOrderQueryParam.java

+package cn.quantgroup.customer.rest.param.ordermapping;
+
+import lombok.Data;
+
+/**
+ * @author yangjun
+ * @Date 2020/4/13 16:16
+ * @Desc
+ * @Update
+ */
+@Data
+public class EarlySettleUpOrderQueryParam {
+    private String phoneNo;
+    private Long userId;
+    private Long loanId;
+    private String fundOrderNo;
+    private String channelOrderNo;
+    private Long channelId;
+}

src/main/java/cn/quantgroup/customer/rest/param/ordermapping/OperateEntryParam.java

+package cn.quantgroup.customer.rest.param.ordermapping;
+
+import lombok.Data;
+
+/**
+ * @author yangjun
+ * @Date 2020/4/13 16:16
+ * @Desc
+ * @Update
+ */
+@Data
+public class OperateEntryParam {
+    private Long loanId;
+    private String remark;
+
+    /**
+     * 0 设置隐藏  1 设置显示
+      */
+
+    private Integer opState;
+}

src/main/java/cn/quantgroup/customer/service/IOrderService.java

@@ -4,6 +4,8 @@ import cn.quantgroup.customer.model.order.FlowNode;
 import cn.quantgroup.customer.model.order.LoanOrderDetail;
 import cn.quantgroup.customer.model.order.OrderInfo;
 import cn.quantgroup.customer.model.order.OrderInfoVo;
+import cn.quantgroup.customer.rest.param.ordermapping.EarlySettleUpOrderQueryParam;
+import cn.quantgroup.customer.rest.param.ordermapping.OperateEntryParam;
 import cn.quantgroup.customer.rest.param.ordermapping.OrderQueryParam;
 import cn.quantgroup.customer.rest.vo.JsonResult;
 
@@ -31,4 +33,32 @@ public interface IOrderService{
      * @return
      */
     JsonResult<OrderInfoVo> queryOrderInfo(OrderQueryParam orderQuery);
+
+    /**
+     * 查询提前一次性结清订单信息
+     * @param orderQuery
+     * @return
+     */
+    JsonResult queryEarlySettleUpOrders(EarlySettleUpOrderQueryParam orderQuery);
+
+    /**
+     *  显示or隐藏操作
+     * @param operateEntryParam
+     * @return
+     */
+    JsonResult operateEntry(OperateEntryParam operateEntryParam);
+
+    /**
+     *  提前一次性结清金额试算
+     * @param loanId
+     * @return
+     */
+    JsonResult earlySettleUpTrial(Long loanId);
+
+    /**
+     * 查询操作日志
+     * @param loanId
+     * @return
+     */
+    JsonResult queryOperateLog(Long loanId);
 }

src/main/java/cn/quantgroup/customer/service/impl/OrderServiceImpl.java

@@ -4,16 +4,21 @@ import cn.quantgroup.customer.enums.ErrorCodeEnum;
 import cn.quantgroup.customer.model.kaordermapping.ApplyRequestHistory;
 import cn.quantgroup.customer.model.kaordermapping.LoanOrderMapping;
 import cn.quantgroup.customer.model.order.*;
+import cn.quantgroup.customer.rest.param.ordermapping.EarlySettleUpOrderQueryParam;
+import cn.quantgroup.customer.rest.param.ordermapping.OperateEntryParam;
 import cn.quantgroup.customer.rest.param.ordermapping.OrderQueryParam;
 import cn.quantgroup.customer.rest.vo.JsonResult;
 import cn.quantgroup.customer.service.IKaService;
 import cn.quantgroup.customer.service.IOrderService;
 import cn.quantgroup.customer.service.IXyqbService;
+import cn.quantgroup.customer.util.DateUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
+import java.security.Timestamp;
 import java.util.*;
 
 /**
@@ -132,6 +137,57 @@ public class OrderServiceImpl implements IOrderService {
         }
     }
 
+    @Override
+    public JsonResult queryEarlySettleUpOrders(EarlySettleUpOrderQueryParam orderQuery) {
+        List<EarlySettleUpOrder> list = new ArrayList<>();
+        EarlySettleUpOrder settleUpOrder = new EarlySettleUpOrder();
+        settleUpOrder.setLoanId(123L);
+        settleUpOrder.setAllTerm(12);
+        settleUpOrder.setChannelId(159881L);
+        settleUpOrder.setChannelName("拍拍贷");
+        settleUpOrder.setChannelOrderNo("PP123");
+        settleUpOrder.setFundId(900L);
+        settleUpOrder.setFundName("华融");
+        settleUpOrder.setFundOrderNo("HR9001");
+        settleUpOrder.setLoanAmount(new BigDecimal(10000));
+        settleUpOrder.setPhoneNo("17700021123");
+        settleUpOrder.setHideEntryFlag(Boolean.FALSE);
+        settleUpOrder.setShowEntryFlag(Boolean.FALSE);
+        settleUpOrder.setNoPaidTerm(12);
+        list.add(settleUpOrder);
+        return JsonResult.buildSuccessResult("处理成功", list);
+    }
+
+    @Override
+    public JsonResult operateEntry(OperateEntryParam operateEntryParam) {
+        return JsonResult.buildSuccessResult("处理成功", Boolean.TRUE);
+    }
+
+    @Override
+    public JsonResult earlySettleUpTrial(Long loanId) {
+        EarlySettleUpTrial settleUpTrial = new EarlySettleUpTrial();
+        settleUpTrial.setPrincipal(new BigDecimal(10000));
+        settleUpTrial.setInterest(new BigDecimal(10));
+        settleUpTrial.setOverdueInterest(new BigDecimal(10));
+        settleUpTrial.setOtherFee(new BigDecimal(10));
+        settleUpTrial.setServiceFee(new BigDecimal(10));
+        settleUpTrial.setLiquid(new BigDecimal(10));
+        return JsonResult.buildSuccessResult("处理成功", settleUpTrial);
+    }
+
+    @Override
+    public JsonResult queryOperateLog(Long loanId) {
+        List<OperateLog> list = new ArrayList<>();
+        OperateLog operateLog = new OperateLog();
+        operateLog.setAccount("10000");
+        operateLog.setCreateAt(DateUtil.getCurrentTimestamp());
+        operateLog.setName("李四");
+        operateLog.setOpName("修改用户密码");
+        operateLog.setRemark("客户要求");
+        list.add(operateLog);
+        return JsonResult.buildSuccessResult("处理成功", list);
+    }
+
     /**
      * 处理查询不到orderMapping的情况，可能是进件失败，也可能不存在该笔订单
      *
@@ -216,4 +272,6 @@ public class OrderServiceImpl implements IOrderService {
         log.info("{} 查询订单信息,返回信息 orderInfoVo={}", logPre, orderInfoVo);
         return JsonResult.buildSuccessResult("处理成功", orderInfoVo);
     }
+
+
 }