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

performance-web/src/main/java/com/clx/performance/listener/OwnerLoanPayNotifyListener.java

 package com.clx.performance.listener;
 
 import cn.hutool.json.JSONUtil;
-import com.clx.performance.param.OwnerBankNotifyMqParam;
 import com.clx.performance.constant.RabbitKeyConstants;
 import com.clx.performance.enums.nbbank.NbBankStatusEnum;
+import com.clx.performance.param.OwnerBankNotifyMqParam;
 import com.clx.performance.service.loan.OwnerLoanAccountService;
 import com.clx.performance.service.loan.OwnerLoanRecordService;
 import lombok.AllArgsConstructor;
@@ -23,21 +23,25 @@ public class OwnerLoanPayNotifyListener {
 
     private final OwnerLoanRecordService ownerLoanRecordService;
 
-    private final OwnerLoanAccountService ownerLoanAccountService;
 
     @RabbitListener(queues = RabbitKeyConstants.OWNER_LOAN_PAY_QUEUE)
     public void onMessage(String message) {
-        log.info("处理货主借款支付监听器执行,数据为{}", message);
-        OwnerBankNotifyMqParam param = JSONUtil.toBean(message, OwnerBankNotifyMqParam.class);
+        try {
+            log.info("处理货主借款支付监听器执行,数据为{}", message);
+            OwnerBankNotifyMqParam param = JSONUtil.toBean(message, OwnerBankNotifyMqParam.class);
 
-        if (Objects.equals(param.getPayStatus(), NbBankStatusEnum.Status.SUCCESS.getCode())) {
-            // 支付成功
-            ownerLoanRecordService.paySuccess(param.getMerSeqNo());
+            if (Objects.equals(param.getPayStatus(), NbBankStatusEnum.Status.SUCCESS.getCode())) {
+                // 支付成功
+                ownerLoanRecordService.paySuccess(param.getMerSeqNo());
+
+            } else if (Objects.equals(param.getPayStatus(), NbBankStatusEnum.Status.FAIL.getCode())) {
+                // 支付失败
+                ownerLoanRecordService.payFail(param.getMerSeqNo());
+            }
+        } catch (Exception e) {
+            log.error("处理货主借款支付监听器异常,数据为{}", message, e);
 
         }
-        else if (Objects.equals(param.getPayStatus(), NbBankStatusEnum.Status.FAIL.getCode())) {
-            // 支付失败
-            ownerLoanRecordService.payFail(param.getMerSeqNo());
-        }
+
     }
 }

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

@@ -157,6 +157,7 @@ public class OrderChildServiceImpl implements OrderChildService {
     @Autowired
     private FeignPaymentService feignPaymentService;
 
+
     @Autowired
     private TruckService truckService;
 
@@ -175,6 +176,7 @@ public class OrderChildServiceImpl implements OrderChildService {
     @Autowired
     private OrderChildLoanComponent orderChildLoanComponent;
 
+
     @Override
     public SaveOrderChildVO saveOrderChild(OrderChildSaveParam param) {
 

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

@@ -841,7 +841,7 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
     @Override
     public String sendLoanSms(String mobile, Long loanNo) {
         AliSmsMessageReq req = new AliSmsMessageReq();
-        req.setTemplateCode(messageConfig.getRepaymentTemplateCode());
+        req.setTemplateCode(messageConfig.getBorrowTemplateCode());
         JSONObject jsonObject = new JSONObject();
         //随机生成4位数字
         jsonObject.set("borrowNo", loanNo);

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

@@ -353,7 +353,12 @@ public class OwnerRepaymentServiceImpl  implements OwnerRepaymentService {
         BankTrade bankTrade = bankTradeDao.getOneByField(BankTrade::getMerchantRunningWaterNo, merSeqNo)
                 .orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
         // 查询还款信息
-        OwnerRepayment ownerRepayment = ownerRepaymentDao.getOneByField(OwnerRepayment::getRepaymentNo, bankTrade.getRelationNo()).get();
+        Optional<OwnerRepayment> optional = ownerRepaymentDao.getOneByField(OwnerRepayment::getRepaymentNo, bankTrade.getRelationNo());
+        if (!optional.isPresent()) {
+            log.info("当前merSeqNo查询货主还款未找到{}", merSeqNo);
+            return;
+        }
+        OwnerRepayment ownerRepayment = optional.get();
         ownerRepayment.setStatus(OwnerRePaymentEnum.Status.PAY_FAIL.getCode());
         // 更新借款信息
         ownerRepaymentDao.updateStatusById(ownerRepayment);