订单状态查询 加参数

src/main/java/cn/quantgroup/cashloanflowboss/api/order/controller/OrderController.java

@@ -10,6 +10,7 @@ import cn.quantgroup.cashloanflowboss.core.annotation.CheckChannelRoleByChannelO
 import cn.quantgroup.cashloanflowboss.core.base.Result;
 import cn.quantgroup.cashloanflowboss.core.base.Tuple;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -29,6 +30,8 @@ public class OrderController {
     @Autowired
     private OrderService orderService;
 
+    @Value("${debug.model}")
+    private Boolean debugModel;
 
     /**
      * 订单查询列表接口
@@ -43,11 +46,11 @@ public class OrderController {
     @ChannelIdInit
     @CheckChannelRole
     @GetMapping("/list")
-    public Result orderList(Long channelId, String channelOrderNumber, Integer pageNumber, Integer pageSize) {
+    public Result orderList(Long channelId, String channelOrderNumber, String applyNo, Long loanId, Integer pageNumber, Integer pageSize) {
         if (pageNumber == null || pageSize == null) {
             return Result.buildFial("page信息不对");
         }
-        return Result.buildSuccess(orderService.orderList(channelId, channelOrderNumber, pageNumber, pageSize));
+        return Result.buildSuccess(orderService.orderList(channelId, channelOrderNumber, applyNo, loanId, pageNumber, pageSize));
     }
 
 
@@ -61,12 +64,16 @@ public class OrderController {
     @ChannelIdInit
     @PostMapping("/approve")
     public Result approveOpt(@RequestBody @Valid ApproveVo approveVo) {
-        Tuple<Boolean, Boolean> booleanBooleanTuple = orderService.approveOpt(approveVo);
-        Boolean approveResult = booleanBooleanTuple.getKey();
-        if (approveResult) {
-            return Result.buildSuccess(approveResult, booleanBooleanTuple.getValue() ? "审批操作成功" : "请检查资产计划配置，审批操作成功");
+        if (debugModel) {
+            Tuple<Boolean, Boolean> booleanBooleanTuple = orderService.approveOpt(approveVo);
+            Boolean approveResult = booleanBooleanTuple.getKey();
+            if (approveResult) {
+                return Result.buildSuccess(approveResult, booleanBooleanTuple.getValue() ? "审批操作成功" : "请检查资产计划配置，审批操作成功");
+            } else {
+                return Result.buildSuccess(false,"审批操作失败");
+            }
         } else {
-            return Result.buildSuccess(false,"审批操作失败");
+            return Result.buildSuccess(false,"无此操作");
         }
     }
 
@@ -78,7 +85,11 @@ public class OrderController {
     @Security(authorityId = "Order.lending")
     @PostMapping("/lending")
     public Result<Boolean> lending(@RequestBody @Valid LendingFormModel lendingFormModel) {
-        return Result.buildSuccess(this.orderService.lending(lendingFormModel));
+        if (debugModel) {
+            return Result.buildSuccess(this.orderService.lending(lendingFormModel));
+        } else {
+            return Result.buildSuccess(false,"无此操作");
+        }
     }
 
     /**
@@ -89,7 +100,11 @@ public class OrderController {
     @Security(authorityId = "Order.cancelPreLoan")
     @PostMapping("/cancel/loan")
     public Result<Boolean> cancelPreLoan(@RequestBody @Valid String channelOrderNumber) {
-        return Result.buildSuccess(this.orderService.cancelPreLoan(channelOrderNumber));
+        if (debugModel) {
+            return Result.buildSuccess(this.orderService.cancelPreLoan(channelOrderNumber));
+        } else {
+            return Result.buildSuccess(false,"无此操作");
+        }
     }
 
     /**
@@ -100,7 +115,11 @@ public class OrderController {
     @Security(authorityId = "Order.cancelAfterLoan")
     @PostMapping("/cancel/after/loan")
     public Result<Boolean> cancelAfterLoan(@RequestParam @Valid String channelOrderNumber) {
-        return Result.buildSuccess(this.orderService.cancelAfterLoan(channelOrderNumber));
+        if (debugModel) {
+            return Result.buildSuccess(this.orderService.cancelAfterLoan(channelOrderNumber));
+        } else {
+            return Result.buildSuccess(false,"无此操作");
+        }
     }
 
     /**
@@ -131,4 +150,23 @@ public class OrderController {
         return Result.buildSuccess(orderService.getOrderCallbackRecordList(channelOrderNumber));
     }
 
+
+    /**
+     * 订单还款计划
+     *
+     * @param channelOrderNumber
+     * @return
+     */
+    @Security(authorityId = "Order.repaymentPlan")
+    @ChannelIdInit
+    @CheckChannelRoleByChannelOrderNumber
+    @GetMapping("/repaymentPlan")
+    public Result repaymentPlan(String channelOrderNumber, Long loanId) {
+        return Result.buildSuccess(orderService.findRepaymentPlan(channelOrderNumber, loanId));
+    }
+
+
+
+
+
 }

src/main/java/cn/quantgroup/cashloanflowboss/api/order/service/OrderService.java

@@ -92,7 +92,7 @@ public class OrderService {
 
 
 
-    public Page<OrderVo> orderList(Long channelId, String channelOrderNo, Integer pageNumber, Integer pageSize) {
+    public Page<OrderVo> orderList(Long channelId, String channelOrderNo, String applyNo, Long loanId, Integer pageNumber, Integer pageSize) {
         Page<ClfOrderMapping> page = this.clfOrderMappingRepository.findAll((root, criteriaQuery, criteriaBuilder) -> {
 
             List<Predicate> predicates = new ArrayList<>();
@@ -104,6 +104,12 @@ public class OrderService {
             if (StringUtils.isNotEmpty(channelOrderNo)) {
                 predicates.add(criteriaBuilder.equal(root.get("channelOrderNo"), channelOrderNo));
             }
+            if (StringUtils.isNotEmpty(applyNo)) {
+                predicates.add(criteriaBuilder.equal(root.get("applyNo"), applyNo));
+            }
+            if (loanId != null && loanId > 0) {
+                predicates.add(criteriaBuilder.equal(root.get("loanId"), loanId));
+            }
 
             // 设置查询条件
             criteriaQuery.where(criteriaBuilder.and(predicates.toArray(new Predicate[predicates.size()])));
@@ -461,4 +467,23 @@ public class OrderService {
         }
         return callbackRecordVoModelList;
     }
+
+    /**
+     * 查询还款计划
+     * @param channelOrderNumber
+     * @param loanId
+     * @return
+     */
+    public Object findRepaymentPlan(String channelOrderNumber, Long loanId) {
+        if (loanId == null || loanId < 1) {
+            ClfOrderMapping orderMapping = clfCenterService.findOrderMappingByChannelOrderNo(channelOrderNumber);
+            if (orderMapping == null || orderMapping.getLoanId() == null) {
+                return null;
+            }
+            loanId = orderMapping.getLoanId();
+        }
+
+        // xyqbCenterService.findRepaymentPlan(loanId);
+        return null;
+    }
 }

src/main/java/cn/quantgroup/cashloanflowboss/spi/clf/service/CLFCenterService.java

@@ -2,8 +2,10 @@ package cn.quantgroup.cashloanflowboss.spi.clf.service;
 
 import cn.quantgroup.cashloanflowboss.spi.clf.entity.CallbackFailRecord;
 import cn.quantgroup.cashloanflowboss.spi.clf.entity.CallbackRecord;
+import cn.quantgroup.cashloanflowboss.spi.clf.entity.ClfOrderMapping;
 import cn.quantgroup.cashloanflowboss.spi.clf.repository.CallbackFailRecordRepository;
 import cn.quantgroup.cashloanflowboss.spi.clf.repository.CallbackRecordRepository;
+import cn.quantgroup.cashloanflowboss.spi.clf.repository.ClfOrderMappingRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -23,6 +25,9 @@ public class CLFCenterService {
     private CallbackFailRecordRepository callbackFailRecordRepository;
     @Autowired
     private CallbackRecordRepository callbackRecordRepository;
+    @Autowired
+    private ClfOrderMappingRepository orderMappingRepository;
+
 
     public List<CallbackFailRecord> findCallbackFailRecordByApplyNo(String applyNo) {
         return callbackFailRecordRepository.findByApplyNo(applyNo);
@@ -31,4 +36,8 @@ public class CLFCenterService {
     public List<CallbackRecord> findCallbackRecordByApplyNo(String applyNo) {
         return callbackRecordRepository.findByApplyNo(applyNo);
     }
- }
+
+    public ClfOrderMapping findOrderMappingByChannelOrderNo(String channelOrderNumber) {
+        return orderMappingRepository.findByChannelOrderNoLastOne(channelOrderNumber);
+    }
+}