小猪结算-提现修改

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/xzsz/impl/XzServiceImpl.java

@@ -229,53 +229,29 @@ public class XzServiceImpl implements XzService {
 
     @Override
     public SingleSubmitResp singleSubmit(XzWithdrawalVO xzWithdrawalVO) {
-        log.info("--------------------------------");
         log.info("singleSubmit param: {}", com.alibaba.fastjson2.JSONObject.toJSONString(xzWithdrawalVO));
-        log.info("getXzAppSecret: {}", userSystemConstant.getXzAppSecret());
-        log.info("getXzAppKey: {}", userSystemConstant.getXzAppKey());
-        log.info("--------------------------------");
         PiggySingleWithdrawalApiV2Client v2Client = PiggySingleWithdrawalApiV2Client.getInstanse(userSystemConstant.getXzAppSecret(), userSystemConstant.getXzDomain());
-//        JSONObject jsonObject = v2Client.singleSubmit(PiggySingleWithdrawV2Vo.builder()
-//                .appKey(userSystemConstant.getXzAppKey())
-//                .bizAESContent(PiggyOpenBasicsAesUtil.produceAesData(userSystemConstant.getXzAppSecret(), userSystemConstant.getXzAes(), PiggySingleWithdrawV2Vo.SingleWithdrawV2Vo.builder()
-//                        .notifyUrl(userSystemConstant.getWithdrawNotify())
-//                        .taxFundId(userSystemConstant.getTaxFundId())
-//                        .month(xzWithdrawalVO.getMonth())
-//                        .outerTradeNo(xzWithdrawalVO.getOuterTradeNo())
-//                        .empNum(xzWithdrawalVO.getEmpNum())
-//                        .empName(xzWithdrawalVO.getEmpName())
-//                        .empPhone(xzWithdrawalVO.getEmpPhone())
-//                        .licenseType(xzWithdrawalVO.getLicenseType())
-//                        .licenseId(xzWithdrawalVO.getLicenseId())
-//                        .settleType(xzWithdrawalVO.getSettleType())
-//                        .payAccount(xzWithdrawalVO.getPayAccount())
-//                        .positionName(userSystemConstant.getXzPosition())
-//                        .payAmount(xzWithdrawalVO.getPayAmount())
-//                        .bankRemo(xzWithdrawalVO.getBankRemo())
-//                        .build()))
-//                .build());
-        JSONObject jsonObject1 = v2Client.singleSubmit(PiggySingleWithdrawV2Vo.builder()
+        JSONObject jsonObject = v2Client.singleSubmit(PiggySingleWithdrawV2Vo.builder()
                 .appKey(userSystemConstant.getXzAppKey())
                 .bizAESContent(PiggyOpenBasicsAesUtil.produceAesData(userSystemConstant.getXzAppSecret(), userSystemConstant.getXzAes(), PiggySingleWithdrawV2Vo.SingleWithdrawV2Vo.builder()
-                        .notifyUrl("http://test.iuav.shop/userapp/xz/xzWithdrawNotify")
-                        .taxFundId("8ae605f565884a1f9a5e91d5a661ce58")
-                        .month("2023-09")
-                        .outerTradeNo("hhtest-12345678")
-                        .empName("龚洪江")
-                        .empPhone("18934827559")
-                        .licenseId("362204199910256912")
-                        .licenseType("ID_CARD")
-                        .settleType("bankcard")
-                        .payAccount("6230520600075922976")
-                        .positionName("销售推广")
-//                        .bankName("招商银行成都分行")
-                        .payAmount(7.5)
-                        .wechatAppId("")
+                        .notifyUrl(userSystemConstant.getWithdrawNotify())
+                        .taxFundId(userSystemConstant.getTaxFundId())
+                        .month(xzWithdrawalVO.getMonth())
+                        .outerTradeNo(xzWithdrawalVO.getOuterTradeNo())
+                        .empNum(xzWithdrawalVO.getEmpNum())
+                        .empName(xzWithdrawalVO.getEmpName())
+                        .empPhone(xzWithdrawalVO.getEmpPhone())
+                        .licenseType(xzWithdrawalVO.getLicenseType())
+                        .licenseId(xzWithdrawalVO.getLicenseId())
+                        .settleType(xzWithdrawalVO.getSettleType())
+                        .payAccount(xzWithdrawalVO.getPayAccount())
+                        .positionName(userSystemConstant.getXzPosition())
+                        .payAmount(xzWithdrawalVO.getPayAmount())
+                        .bankRemo(xzWithdrawalVO.getBankRemo())
                         .build()))
                 .build());
-        log.info("jsonObject1 res:{}", com.alibaba.fastjson2.JSONObject.toJSONString(jsonObject1));
-//        log.info("singleSubmit res:{}", com.alibaba.fastjson2.JSONObject.toJSONString(jsonObject));
-        SingleSubmitResp singleSubmitResp = com.alibaba.fastjson2.JSONObject.parseObject(jsonObject1.toString(), SingleSubmitResp.class);
+        log.info("singleSubmit res: {}", com.alibaba.fastjson2.JSONObject.toJSONString(jsonObject));
+        SingleSubmitResp singleSubmitResp = com.alibaba.fastjson2.JSONObject.parseObject(jsonObject.toString(), SingleSubmitResp.class);
         return singleSubmitResp;
     }
 

csm-service/cms-service-user/src/main/resources/application-dev.yml

@@ -78,7 +78,7 @@ third-party:
     #    taxFundId: xxxxxxxxxxxxxxxxxxxxxxx
     appKey: 37f76305f1864339adc8d6d03fbf918d
     appSecret: hangzhouyunxiangfeikeji000000000
-    aes: 0000000000000000
+    aes: '0000000000000000'
     domain: https://saas.xzsz.ltd
     position: 市场推广
     taxFundId: 0b0376083af4435885bd5d5cd3d63053

csm-service/cms-service-user/src/main/resources/application-local.yml

@@ -41,10 +41,10 @@ third-party:
   xzsz:
     appKey: 1e8e59e056be41f8a05c090964d7ce37
     appSecret: ceshihuanjingyanshizhanghao00000
-    aes: 0000000000000000
+    aes: '0000000000000000'
     domain: https://uat.xzsz.ltd/
     position: 销售推广
-    taxFundId: xxxxxxxxxxxxxxxxxxxxxxx
+    taxFundId: 8ae605f565884a1f9a5e91d5a661ce58
     authNotify: https://test.iuav.shop/userapp/xz/xzAuthNotify
     withdrawNotify: https://test.iuav.shop/userapp/xz/xzWithdrawNotify
 

csm-service/cms-service-user/src/main/resources/application-prod.yml

@@ -70,7 +70,7 @@ third-party:
   xzsz:
     appKey: 37f76305f1864339adc8d6d03fbf918d
     appSecret: hangzhouyunxiangfeikeji000000000
-    aes: 0000000000000000
+    aes: '0000000000000000'
     domain: https://saas.xzsz.ltd
     position: 市场推广
     taxFundId: 0b0376083af4435885bd5d5cd3d63053