Merge branch 'demo_bank_20231123' into test

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

@@ -19,9 +19,46 @@ import java.util.Map;
 @Api(tags = "宁波银行回调")
 public class NbBankController {
 
+
+    /**
+     * 解密后
+     * {
+     *     "data": {
+     *         "clearDate": "20231205",
+     *         "merId": "EFT33021200556315",
+     *         "merSeqNo": "20231205165038",
+     *         "payMethod": "L",
+     *         "pyerInfList": [
+     *             {
+     *                 "coreSeqNo": "",
+     *                 "customerId": "",
+     *                 "pyerAcctBankName": "",
+     *                 "pyerAcctBankNo": "",
+     *                 "pyerAcctName": "黑玫瑰",
+     *                 "pyerAcctNo": "86041110000076809",
+     *                 "signNo": "00",
+     *                 "transAmt": "0.01",
+     *                 "transDtTm": "2023-12-05 16:54:22"
+     *             }
+     *         ],
+     *         "realTrxAmt": "0.01",
+     *         "transDate": "20231205",
+     *         "transSeqNo": "2023120516503906838128gg6DOzjP",
+     *         "transStatus": "00",
+     *         "trxAmt": "0.01"
+     *     },
+     *     "head": {
+     *         "rqsJrnlNo": "16071726224843844",
+     *         "rspCode": "000000",
+     *         "rspDate": "2023-12-05",
+     *         "rspMsg": "处理成功",
+     *         "rspTime": "17:13:43:943"
+     *     }
+     * }
+     */
     @ApiOperation(value = "notify", notes = "<br>By:艾庆国")
     @RequestMapping(value = "/notify", method = RequestMethod.POST)
-    public SDKResponse notify(@RequestBody Map<String, Object> body) throws Exception {
+    public Object notify(@RequestBody Map<String, Object> body) throws Exception {
 
         log.info("宁波银行回调, data:{}", JSON.toJSONString(body));
 
@@ -51,7 +88,7 @@ public class NbBankController {
         return getResultSuc();
     }
 
-    private SDKResponse getResultSuc() throws Exception {
+    private Object getResultSuc() throws Exception {
 
         Map<String, String> data = new HashMap<>();
         data.put("errorCode", "000000");
@@ -73,13 +110,13 @@ public class NbBankController {
         SDKResponse result = NBOpenSDK.encryptMessage(request);
         log.info("加密后: "+JSON.toJSONString(result));
 
-        return result;
+        return result.getData();
     }
-    private SDKResponse getResultFail() throws Exception {
+    private Object getResultFail() throws Exception {
 
         Map<String, String> data = new HashMap<>();
         data.put("errorCode", "ER001");
-        data.put("errorMsg", "成功");
+        data.put("errorMsg", "失败");
 
         RequestApiData requestApiData = new RequestApiData();
         requestApiData.setAppkey("77667c76_3503_4c04_95f7_fc10938c7942");
@@ -97,7 +134,7 @@ public class NbBankController {
         SDKResponse result = NBOpenSDK.encryptMessage(request);
         log.info("加密后: "+JSON.toJSONString(result));
 
-        return result;
+        return result.getData();
     }
 
 }