强制结清

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

@@ -39,8 +39,6 @@ public interface OrderService {
     @Transactional
     Tuple<Boolean, String> lending(LendingFormModel lendingFormModel);
 
-    boolean cancel(OrderVo orderVo);
-
     HistoryOrderStatusVoModel getOrderHistoryStatus(String channelOrderNumber);
 
     Tuple<Boolean,String> cancelPreLoan(String channelOrderNumber);

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

@@ -299,8 +299,6 @@ public class OrderServiceImpl implements OrderService{
     @OperationAnno(channelNo = "#this[0]", opt = OptEnumName.SECORD_AUDIT, succSPEL = "#this.key", optDetailSPEL = "#this.value")
     public Tuple<Boolean, String> secondAudit(String channelOrderNumber) {
 
-        OptEnumName secondAudit = OptEnumName.SECORD_AUDIT;
-
         boolean result = true;
 
 
@@ -426,33 +424,6 @@ public class OrderServiceImpl implements OrderService{
 
     }
 
-    @Override
-    //@OperationAnno(channelNo = "#this[0].channelOrderNumber", opt = OptEnumName.PAY, succSPEL = "#this.key", optDetailSPEL = "#this.value")
-    public boolean cancel(OrderVo orderVo) {
-        ClfOrderMapping orderMapping = clfOrderMappingRepository.findByChannelOrderNoLastOne(orderVo.getChannelOrderNumber());
-        if (orderMapping == null) {
-            log.info("executeXYQBSQL,关单失败，无订单 channelOrderNumber={}", orderVo.getChannelOrderNumber());
-            return false;
-        }
-
-        XUser xUser = xyqbUserService.findXUserById(orderMapping.getQgUserId());
-        if (xUser == null) {
-            log.info("executeXYQBSQL,关单失败，未找到用户 channelOrderNumber={}", orderVo.getChannelOrderNumber());
-            return false;
-        }
-        Long userId = xUser.getId();
-        ConcurrentMap<Object, Object> data = Maps.newConcurrentMap();
-        ArrayList<Object> cancel_list = Lists.newArrayList();
-        cancel_list.add("update xyqb.quota_credit set is_active=0 where user_id=" + userId);
-        cancel_list.add("update xyqb.quota_account set is_active=0 where user_id=" + userId);
-        cancel_list.add("update xyqb.loan_application_history set progress=16,is_active=0 where user_id=" + userId);
-        cancel_list.add("delete from apply_quota_record where user_id=" + userId);
-        cancel_list.add("delete from user_operation_history where user_id=" + userId);
-        data.put("sql", cancel_list);
-        String cancel_result = jolyneService.executeXYQBSQL(JSONTools.serialize(data));
-        return "success".equals(cancel_result);
-    }
-
     @Override
     public HistoryOrderStatusVoModel getOrderHistoryStatus(String channelOrderNumber) {
         ClfOrderMapping orderMapping = clfOrderMappingRepository.findByChannelOrderNoLastOne(channelOrderNumber);
@@ -662,7 +633,6 @@ public class OrderServiceImpl implements OrderService{
     @Override
     public Tuple<Boolean,String> settle(String channelOrderNumber) {
 
-        OrderApprove approve = orderApproveRepository.findByChannelOrderNumber(channelOrderNumber);
         ClfOrderMapping orderMapping = clfCenterService.findOrderMappingByChannelOrderNo(channelOrderNumber);
         if (orderMapping != null && StringUtils.isNotEmpty(orderMapping.getApplyNo())) {
             ServiceResult<XyqbCurrentOrderStatusServiceResultModel> xyqbOrderStatus = xyqbCenterService.getXyqbOrderStatus(orderMapping.getApplyNo(), orderMapping.getLoanId());
@@ -673,10 +643,8 @@ public class OrderServiceImpl implements OrderService{
                 }
 
             }
-            // 普通 订单 关单
-
-
-            return new Tuple<>(true, "操作成功");
+            // 普通 订单 关单(清楚用户活跃订单)
+            return xyqbCenterService.cleanUserActiveOrder(orderMapping.getQgUserId());
         } else {
             return new Tuple<>(false, "订单不存在");
         }