Merge branch 'dev/2024/0703/update-app-Y' of Harper/feifan-backend-zx-app into master

新增支付通道

feifan-module-pay/feifan-module-pay-biz/src/main/java/cn/newfeifan/mall/module/pay/controller/app/fuyouorder/NewPayOrderController.java

@@ -40,44 +40,6 @@ public class NewPayOrderController {
         return success(respVO);
     }
 
-    @PostMapping("/test1")
-    @Operation(summary = "test1")
-    public CommonResult<String> test1() {
-        FuiouHttpPoster http = new FuiouHttpPoster();
-        http.setUrl("//");
-        return success("success");
-    }
-    @PostMapping("/test2")
-    @Operation(summary = "test2")
-    public CommonResult<String> test2() {
-        HttpClient httpclient = new HttpClient();
-        return success("success");
-    }
-    @PostMapping("/test3")
-    @Operation(summary = "test3")
-    public CommonResult<String> test3() {
-        FuiouHttpPoster http = new FuiouHttpPoster();
-        http.setUrl("//");
-        try {
-            String res = http.newPost(JSON.toJSONString(""));
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-        return success("success");
-    }
-    @PostMapping("/test4")
-    @Operation(summary = "test4")
-    public CommonResult<String> test4() {
-        Test http = new Test();
-        http.setUrl("//");
-//        try {
-//            String res = http.newPost(JSON.toJSONString(""));
-//        } catch (Exception e) {
-//            throw new RuntimeException(e);
-//        }
-        return success("success");
-    }
-
     @PostMapping("/notify")
     @Operation(summary = "富友支付订单回调")
     public CommonResult<String> notifyFuYouPayOrder(@RequestBody FuYouPaymentResponseVO responseVO) {

feifan-module-pay/feifan-module-pay-biz/src/main/java/cn/newfeifan/mall/module/pay/service/fuyouorder/FiYouPayOrderServiceImpl.java

@@ -93,7 +93,7 @@ public class FiYouPayOrderServiceImpl implements FuYouPayOrderService {
             FuYouPayOrderSubmitRespVO vo = FuYouPayOrderSubmitRespVO.builder()
                     .appId(resp.getSdk_appid())
                     .timeStamp(resp.getSdk_timestamp())
-                    .nonceStr(resp.getRandom_str())
+                    .nonceStr(resp.getSdk_noncestr())
                     .sdk_package(resp.getSdk_package())
                     .signType(resp.getSdk_signtype())
                     .paySign(resp.getSdk_paysign())