Merge remote-tracking branch 'origin/test' into test

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

@@ -3,6 +3,7 @@ package com.clx.performance.controller.temp;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.clx.performance.service.TempService;
+import com.clx.performance.utils.LocalDateTimeUtils;
 import com.clx.performance.vo.pc.child.OrderChildLineStatisticsVO;
 import com.msl.common.result.Result;
 import com.nbopen.api.*;
@@ -60,14 +61,19 @@ public class TempYftBankController {
     }
 
     //API测试接口
+
+    /**
+     * 银行转账：86041110000075918（户名：客户客户）
+     * 订单支付：结算账号（86041110000075926（户名：客户客户））
+     */
     private static void testAPI() {
         try {
             JSONObject jsonObject = new JSONObject();
             jsonObject.put("transId", "IP01");      //交易识别码 必填
-            jsonObject.put("merId", "2023112300000002");     //商户号 必填
+            jsonObject.put("merId", "EFT33021200556315");     //商户号 必填
 
-            jsonObject.put("merSeqNo", "2023112300000001");     //商户流水 必填
-            jsonObject.put("merDtTm", "2023-11-24 11:00:00");     //商户时间 必填
+            jsonObject.put("merSeqNo", "2023112300000002");     //商户流水 必填
+            jsonObject.put("merDtTm", LocalDateTimeUtils.formatTime());     //商户时间 必填
 
             jsonObject.put("trxAmt", "1.23");     //订单金额 必填
             jsonObject.put("orderDesc", "采购");     //订单详情 必填
@@ -75,8 +81,8 @@ public class TempYftBankController {
             jsonObject.put("productId", "001");     //商品编号 必填
             jsonObject.put("productNum", "1");     //商品数量 必填
 
-            jsonObject.put("payAcctNo", "6223161100110442");     //付款账号 必填
-            jsonObject.put("payAcctNm", "刘晓琴");     //付款户名 必填
+            jsonObject.put("payAcctNo", "86041110000075926");     //付款账号 必填
+            jsonObject.put("payAcctNm", "客户客户");     //付款户名 必填
             jsonObject.put("bankType", "00");     //账户类型 必填
             jsonObject.put("payAcctOpenBankId", "313332082914");     //开户行号 必填
 //        jsonObject.put("mobilePhone", "13000000000");     //手机号

performance-web/src/main/java/com/clx/performance/controller/thirdparty/NbBankController.java

+package com.clx.performance.controller.thirdparty;
+
+import com.msl.common.result.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+@Slf4j
+@RestController
+@RequestMapping(value="/nbbank")
+@Api(tags = "宁波银行回调")
+public class NbBankController {
+
+    @ApiOperation(value = "notify", notes = "<br>By:艾庆国")
+    @RequestMapping(value = "/notify", method = RequestMethod.POST)
+    public Result bankNotify() {
+
+        return Result.ok();
+    }
+
+}