Merge branch 'v10.7_borrowing_and_repayment_20240118' into test

performance-api/src/main/java/com/clx/performance/vo/pc/nbbank/NbBankOrderResultVO.java

@@ -33,7 +33,7 @@ public class NbBankOrderResultVO {
     @ApiModelProperty(value = "转账编号（转账专用）", example = "1234567")
     private String signNo;
 
-    @ApiModelProperty(value = "交易状态", example = "")
+    @ApiModelProperty(value = "交易状态：1交易成功 2交易失败 3交易已受理 4订单初始状态 5交易不存在 6交易超时", example = "1")
     private Integer transStatus;
 
 }
\ No newline at end of file

performance-web/src/main/java/com/clx/performance/controller/temp/TempBankController.java

@@ -72,4 +72,12 @@ public class TempBankController {
         return Result.ok(bankService.refund(orgMerSeqNo,amount,orgTransSeqNo));
     }
 
+    @ApiOperation(value = "回调", notes = "<br>By:艾庆国")
+    @RequestMapping(value = "/notify", method = RequestMethod.POST)
+    public Result notify(NbBankOrderResultVO param) {
+        bankService.orderPayCallback(param.getMerSeqNo(), param.getTransSeqNo(),
+                param.getAmount(), param.getAmount(), param.getTransStatus(), param.getSignNo());
+        return Result.ok();
+    }
+
 }

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

@@ -204,25 +204,47 @@ public class NbBankServiceImpl implements NbBankService {
         log.info("宁波银行支付回调, merSeqNo:{}, transSeqNo:{}, trxAmt:{}, realTrxAmt:{}, transSeqNo:{}, signNo:{}",
                 merSeqNo, transSeqNo, trxAmt, realTrxAmt, transStatus, signNo);
 
+        NbBankOrderResultVO result = new NbBankOrderResultVO();
         if (StringUtils.equals(transStatus, "00")){     //交易成功
-
+            result.setTransStatus(1);
         }
         if (StringUtils.equals(transStatus, "01")){     //交易失败
-
+            result.setTransStatus(2);
         }
         if (StringUtils.equals(transStatus, "02")){     //交易已受理
-
+            result.setTransStatus(3);
         }
         if (StringUtils.equals(transStatus, "80")){     //订单初始状态
-
+            result.setTransStatus(4);
         }
         if (StringUtils.equals(transStatus, "90")){     //交易不存在
-
+            result.setTransStatus(5);
         }
         if (StringUtils.equals(transStatus, "99")){     //交易超时,须发起交易结果查询
+            result.setTransStatus(6);
+        }
 
+        orderPayCallback(merSeqNo, transSeqNo, trxAmt, realTrxAmt, result.getTransStatus(), signNo);
     }
 
+
+    /**
+     * 银行回调
+     * @param merSeqNo 商户流水号
+     * @param transSeqNo 第三方流水号
+     * @param trxAmt 订单金额分
+     * @param realTrxAmt 实收金额分
+     * @param transStatus 交易状态
+     * @param signNo 转账编码
+     */
+    @Override
+    public void orderPayCallback(String merSeqNo, String transSeqNo,
+                                 Integer trxAmt, Integer realTrxAmt,
+                                 Integer transStatus,
+                                 String signNo) {
+        log.info("宁波银行支付回调, merSeqNo:{}, transSeqNo:{}, trxAmt:{}, realTrxAmt:{}, transSeqNo:{}, signNo:{}",
+                merSeqNo, transSeqNo, trxAmt, realTrxAmt, transStatus, signNo);
+
     }
 
     /**

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

@@ -24,5 +24,10 @@ public interface NbBankService {
                           String transStatus,
                           String signNo
     );
+    void orderPayCallback(String merSeqNo, String transSeqNo,
+                          Integer trxAmt, Integer realTrxAmt,
+                          Integer transStatus,
+                          String signNo
+    );
 
 }