Merge branch 'develop' of ssh://git.mmcuav.cn:8222/iuav/cms into develop

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/wallet/PayWalletController.java

@@ -48,7 +48,7 @@ public class PayWalletController extends BaseController {
     public ResultBody feignTopUpCash(@RequestBody TopUpOrderVO topUpOrderVO) {
         return payWalletService.feignTopUpCash(topUpOrderVO);
     }
-    
+
     @ApiOperation(value = "feign-钱包流水记录")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
     @PostMapping("feignWalletFlow")
@@ -56,6 +56,13 @@ public class PayWalletController extends BaseController {
         return payWalletService.feignWalletFlow(walletFlowVO);
     }
 
+    @ApiOperation(value = "feign-钱包流水记录不带token")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @PostMapping("feignWalletFlowNO")
+    public ResultBody feignWalletFlowNO(@RequestBody WalletFlowVO walletFlowVO) {
+        return payWalletService.feignWalletFlow(walletFlowVO);
+    }
+
     @ApiOperation(value = "用户账单明细")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = UserBillingDetailVO.class)})
     @PostMapping("customerBillingDetail")

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

@@ -229,7 +229,7 @@ public class XzServiceImpl implements XzService {
 
     @Override
     public SingleSubmitResp singleSubmit(XzWithdrawalVO xzWithdrawalVO) {
-        log.info("xzWithdrawalVO param:{}", com.alibaba.fastjson2.JSONObject.toJSONString(xzWithdrawalVO));
+        log.info("singleSubmit param: {}", com.alibaba.fastjson2.JSONObject.toJSONString(xzWithdrawalVO));
         PiggySingleWithdrawalApiV2Client v2Client = PiggySingleWithdrawalApiV2Client.getInstanse(userSystemConstant.getXzAppSecret(), userSystemConstant.getXzDomain());
         JSONObject jsonObject = v2Client.singleSubmit(PiggySingleWithdrawV2Vo.builder()
                 .appKey(userSystemConstant.getXzAppKey())
@@ -245,12 +245,12 @@ public class XzServiceImpl implements XzService {
                         .licenseId(xzWithdrawalVO.getLicenseId())
                         .settleType(xzWithdrawalVO.getSettleType())
                         .payAccount(xzWithdrawalVO.getPayAccount())
-                        .positionName(xzWithdrawalVO.getPositionName())
+                        .positionName(userSystemConstant.getXzPosition())
                         .payAmount(xzWithdrawalVO.getPayAmount())
                         .bankRemo(xzWithdrawalVO.getBankRemo())
                         .build()))
                 .build());
-        log.info("singleSubmit res:{}", com.alibaba.fastjson2.JSONObject.toJSONString(jsonObject));
+        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
 
@@ -59,4 +59,4 @@ iuav:
   pay:
     uri: http://127.0.0.1:8088
   pms:
-    uri: http://127.0.0.1:8099
\ No newline at end of file
+    uri: http://127.0.0.1:8099

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

csm-service/cms-service-user/src/main/resources/not-check.yml

@@ -32,4 +32,5 @@ data-filter:
     - /userapp/xz/xzAuthNotify
     - /userapp/xz/xzWithdrawNotify
     - /userapp/pay/feignTopUpCash
+    - /userapp/pay/feignWalletFlowNO
 

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/cms
-  newTag: 7a280c1a943689f279e6a225ad6fb4832d71277b
+  newTag: 07def1b16f3ee9892034287a4cc13952a682be4e