修改钱包流水bug

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/constant/fdd/FddConnectConstant.java

+package com.mmc.iuav.user.constant.fdd;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author:zhenjie Date:2022/7/16
+ * time:14:58
+ */
+@Component
+public class FddConnectConstant {
+    public static String APP_ID;
+    public static String APP_KEY;
+    public static String VERSION;
+    public static String HOST;
+    public static String MMC_URL;
+
+    public FddConnectConstant(@Value("${fdd.appid}") String appid, @Value("${fdd.appkey}") String appkey,
+                              @Value("${fdd.version}") String version, @Value("${fdd.host}") String host,
+                              @Value("${fdd.mmc-url}") String mmcUrl) {
+        APP_ID = appid;
+        APP_KEY = appkey;
+        VERSION = version;
+        HOST = host;
+        MMC_URL = mmcUrl;
+    }
+}

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/constant/fdd/FddConstant.java

+package com.mmc.iuav.user.constant.fdd;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * author:zhenjie
+ * Date:2022/7/22
+ * time:11:07
+ */
+@Component
+public class FddConstant {
+    public static final String CODE = "code";
+
+    public static final String DATA = "data";
+
+    public static final String SUCCESS = "1";
+
+    public static final String MSG = "msg";
+
+    public static final String SIGNATURE_ID = "signature_id";
+
+    public static final String UPLOAD_FILE = "uploadFile/";
+
+    //企业实名认证异步回调
+    public static final String NOTIFY_E_CERT_RES = "fddservlet/fdd/notifyECertRes";
+    //企业实名认证同步回调
+    public static final String RETURN_E_CERT_RES = "fddservlet/fdd/returnECertRes";
+    //小程序企业实名认证异步回调
+    public static final String APP_NOTIFY_E_CERT_RES = "fddservlet/appfdd/notifyECertRes";
+    //签署合同异步回调
+    public static final String NOTIFY_STAMP = "fddservlet/contract/notifyStamp";
+
+    public static final String UAV_NOTIFY_STAMP = "fddservlet/uav/contract/notifyStamp";
+
+    public static final String APP_ID = "appId";
+
+    public static final String CUSTOMER_ID = "customerId";
+
+    public static final String STATUS = "status";
+
+    public static final String SERIAL_NO = "serialNo";
+
+    public static final String SIGN = "sign";
+
+    public static final String UID_REGEX = "[-|_]";
+}

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/wallet/impl/PayWalletServiceImpl.java

@@ -137,10 +137,10 @@ public class PayWalletServiceImpl implements PayWalletService {
             publishUpdatePayWallet.setPid(publishWallet.getPid());
             publishUpdatePayWallet.setCashAmt(publishWallet.getCashAmt().add(publisherWalletFlowVO.getCashAmount()));
             publishUpdatePayWallet.setCashFreeze(publishWallet.getCashFreeze().subtract(publisherWalletFlowVO.getCashAmount())
-                    .add(publisherWalletFlowVO.getYxjCashPledge()).add(publisherWalletFlowVO.getYxjCashPledge()));
+                    .add(publisherWalletFlowVO.getYxjCashPledge()));
             publishUpdatePayWallet.setSalaryAmt(publishWallet.getSalaryAmt().add(publisherWalletFlowVO.getSalaryAmount()));
             publishUpdatePayWallet.setSalaryFreeze(publishWallet.getSalaryFreeze().add(publisherWalletFlowVO.getSalaryCashPledge())
-                    .subtract(publisherWalletFlowVO.getSalaryAmount()).add(publisherWalletFlowVO.getSalaryCashPledge()));
+                    .subtract(publisherWalletFlowVO.getSalaryAmount()));
             // 更新发布者钱包数据
             int publishUpdateCount = payWalletDao.updatePayWallet(publishUpdatePayWallet);
             if (publishUpdateCount <= 0) {