Merge branch 'v10.7_borrowing_and_repayment_20240118' into test

performance-api/src/main/java/com/clx/performance/enums/loan/BankTradeEnum.java

@@ -33,6 +33,7 @@ public enum BankTradeEnum {
     @AllArgsConstructor
     public enum OrderType {
         OWNER_LOAN_RECORD(1, "货主借款"),
+        OWNER_REPAYMENT_RECORD(2, "货主还款"),
 
         ;
 

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

@@ -144,7 +144,7 @@ public class OwnerLoanAccountServiceImpl implements OwnerLoanAccountService {
         ownerRepaymentDao.updateRePay(ownerRepayment);
 
         bankTrade.setRelationNo(ownerRepayment.getRepaymentNo().toString());
-        bankTrade.setOrderType(BankTradeEnum.OrderType.OWNER_LOAN_RECORD.getCode());
+        bankTrade.setOrderType(BankTradeEnum.OrderType.OWNER_REPAYMENT_RECORD.getCode());
         bankTrade.setAmount(ownerLoanRecord.getLoanBalance());
         bankTrade.setMerchantRunningWaterNo(ownerRepayment.getMerchantRunningWaterNo());
         bankTrade.setRunningWaterOpenNo(ownerRepayment.getRunningWaterOpenNo());

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

@@ -554,6 +554,7 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
         bankTrade.setAmount(ownerLoanRecord.getLoanBalance());
         bankTrade.setMerchantRunningWaterNo(ownerLoanRecord.getMerchantRunningWaterNo());
         bankTrade.setRunningWaterOpenNo(ownerLoanRecord.getRunningWaterOpenNo());
+        bankTrade.setRemark("借款单");
 
         // 保存银行交易记录
         bankTradeDao.saveEntity(bankTrade);

performance-web/src/main/java/com/clx/performance/service/impl/thirdparty/nbbank/NbBankServiceImpl.java

@@ -235,24 +235,24 @@ public class NbBankServiceImpl implements NbBankService {
 
         // 更新状态
         bankTradeDao.updateStatus(bankTrade);
-        // 货主借款支付回调
-        if (Objects.equals(bankTrade.getOrderType(), BankTradeEnum.OrderType.OWNER_LOAN_RECORD.getCode())){
-            OwnerBankNotifyMqParam param = new OwnerBankNotifyMqParam();
-            param.setMerSeqNo(merSeqNo);
-            param.setPayStatus(transStatus);
-            Message message = MessageBuilder.withBody(JSONUtil.parse(param).toString().getBytes()).build();
-
-            if ("借款单".equals(bankTrade.getRemark())) {
-                //执行借款支付成功通知
-                rabbitTemplate.send(
-                        RabbitKeyConstants.OWNER_LOAN_EXCHANGE, RabbitKeyConstants.OWNER_LOAN_PAY_ROUTE_KEY, message
-                );
-            } else if ("还款单".equals(bankTrade.getRemark())) {
-                rabbitTemplate.send(
-                        RabbitKeyConstants.OWNER_LOAN_EXCHANGE, RabbitKeyConstants.OWNER_REPAYMENT_ROUTE_KEY, message
-                );            }
 
+        OwnerBankNotifyMqParam param = new OwnerBankNotifyMqParam();
+        param.setMerSeqNo(merSeqNo);
+        param.setPayStatus(transStatus);
+        Message message = MessageBuilder.withBody(JSONUtil.parse(param).toString().getBytes()).build();
 
+        // 货主借款支付回调
+        if (Objects.equals(bankTrade.getOrderType(), BankTradeEnum.OrderType.OWNER_LOAN_RECORD.getCode())){
+            //执行借款支付成功通知
+            rabbitTemplate.send(
+                    RabbitKeyConstants.OWNER_LOAN_EXCHANGE, RabbitKeyConstants.OWNER_LOAN_PAY_ROUTE_KEY, message
+            );
+        }
+        // 货主还款支付回调
+        else if (Objects.equals(bankTrade.getOrderType(), BankTradeEnum.OrderType.OWNER_REPAYMENT_RECORD.getCode())){
+            rabbitTemplate.send(
+                    RabbitKeyConstants.OWNER_LOAN_EXCHANGE, RabbitKeyConstants.OWNER_REPAYMENT_ROUTE_KEY, message
+            );
         }
 
     }