Merge remote-tracking branch 'origin/v10.7_borrowing_and_repayment_20240118'…

performance-api/src/main/java/com/clx/performance/enums/PerformanceResultEnum.java

@@ -130,9 +130,10 @@ public enum PerformanceResultEnum implements ResultEnum {
 
     OWNER_LOAN_RECORD_PAY_STATUS_ERROR(1850, "状态已变更无法支付"),
     OWNER_LOAN_RECORD_CANCEL_STATUS_ERROR(1851, "状态已变更无法取消"),
-    OWNER_LOAN_RECORD_ADJUST_STATUS_ERROR(1851, "状态已变更无法核销"),
-    OWNER_LOAN_RECORD_PAY_WAIT_ERROR(1852,"当前借款单状态不是待付款"),
-    OWNER_LOAN_PAYMENT_STATUS_ERROR(1851, "执行借款审批失败,请稍后重试"),
+    OWNER_LOAN_RECORD_ADJUST_STATUS_ERROR(1852, "状态已变更无法核销"),
+    OWNER_LOAN_RECORD_PAY_WAIT_ERROR(1853,"当前借款单状态不是待付款"),
+    OWNER_LOAN_PAYMENT_STATUS_ERROR(1854, "执行借款审批失败,请稍后重试"),
+    OWNER_LOAN_PAY_STATUS_ERROR(1855, "付款失败"),
 
     ;
     private final int code;

performance-web/src/main/java/com/clx/performance/component/OrderChildLoanComponent.java

@@ -221,13 +221,7 @@ public class OrderChildLoanComponent {
 
         String childNo = settlementDriverDetail.getChildNo();
         List<OwnerLoanAccountRunningWaterRecord> runningWaterRecordList = ownerLoanAccountRunningWaterRecordDao.getListByChildNoAndRunningWaterType(childNo);
-        Map<Integer, List<OwnerLoanAccountRunningWaterRecord>> listMap = runningWaterRecordList.stream().collect(Collectors.groupingBy(OwnerLoanAccountRunningWaterRecord::getRunningWaterType));
 
-        List<OwnerLoanAccountRunningWaterRecord> thawRecord = listMap.get(OwnerLoanAccountRunningWaterRecordEnum.RunWaterType.APPROVE_THAW.getCode());
-        if (CollectionUtil.isNotEmpty(thawRecord)) {
-            log.info("3.1 有借款解冻记录,说明是货主还款触发任务,将runningWaterRecordList置空");
-            runningWaterRecordList = null;
-        }
         log.info("4.查询当前运单号：{}, 当前货主,{}, 此运单借款冻结记录：{}", childNo, settlementOwnerDetail.getOwnerUserNo(), JSONUtil.parse(runningWaterRecordList));
         if (CollectionUtil.isEmpty(runningWaterRecordList)) {
 
@@ -250,7 +244,6 @@ public class OrderChildLoanComponent {
 
         } else {
             BigDecimal alterationBalance = runningWaterRecordList.stream().map(OwnerLoanAccountRunningWaterRecord::getAlterationBalance).reduce(BigDecimal.ZERO, BigDecimal::add);
-            runningWaterRecordList = listMap.get(OwnerLoanAccountRunningWaterRecordEnum.RunWaterType.APPROVE_FROZEN.getCode());
             if (alterationBalance.compareTo(settlementOwnerDetail.getSettlementFreight()) == 0) {
                 log.info("4.2 相等直接生成运单核销");
                 //相等直接生成运单核销

performance-web/src/main/java/com/clx/performance/dao/impl/loan/OwnerLoanAccountRunningWaterRecordDaoImpl.java

@@ -99,7 +99,6 @@ public class OwnerLoanAccountRunningWaterRecordDaoImpl extends BaseDaoImpl<Owner
         return baseMapper.selectList(lQrWrapper().eq(OwnerLoanAccountRunningWaterRecord::getChildNo, childNo)
                 .in(OwnerLoanAccountRunningWaterRecord::getRunningWaterType,
                         OwnerLoanAccountRunningWaterRecordEnum.RunWaterType.APPROVE_FROZEN.getCode()
-                        ,OwnerLoanAccountRunningWaterRecordEnum.RunWaterType.APPROVE_THAW.getCode()
                 )
                 .orderByAsc(OwnerLoanAccountRunningWaterRecord::getId)
         );

performance-web/src/main/java/com/clx/performance/service/impl/loan/OwnerPaymentServiceImpl.java

@@ -80,11 +80,12 @@ public class OwnerPaymentServiceImpl implements OwnerPaymentService {
         param.setRcvName(ownerPayment.getPayee());
         param.setRcvBankId(ownerPayment.getPayeeBankCode());
         Result<NbBankOrderPayResultVO> result = loanPaymentFeign.pay(param);
-        if (result.succeed()) {
+        if (!result.succeed()) {
+            throw new ServiceSystemException(PerformanceResultEnum.OWNER_LOAN_PAY_STATUS_ERROR);
+        }
         ownerPayment.setMerchantRunningWaterNo(merSeqNo);
         ownerPayment.setStatus(OwnerPaymentEnum.Status.PAYING.getCode());
         ownerPaymentDao.updateStatusAndMerchantRunningWaterNo(ownerPayment);
-        }
 
     }
 }