异步回调

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/vo/wallet/PayUavWalletVO.java

@@ -29,7 +29,7 @@ public class PayUavWalletVO implements Serializable {
     @ApiModelProperty(value = "佣金")
     private BigDecimal salaryAmount;
 
-    @ApiModelProperty(value = "订单状态 100：订单支付  1400:商城订单退款 1500:订单提成", required = true)
+    @ApiModelProperty(value = "订单状态 100：订单支付  1400:商城订单退款 1500:订单提成 999:确认收货", required = true)
     private Integer orderStatus;
 
     @ApiModelProperty(value = "订单备注")

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

@@ -28,7 +28,7 @@ public class FddConstant {
     //小程序企业实名认证异步回调
     public static final String NOTIFY_E_CERT_RES = "fdd/auth/notifyECertRes";
     //签署合同异步回调
-    public static final String NOTIFY_STAMP = "/fdd/contract/notifyStamp";
+    public static final String NOTIFY_STAMP = "fdd/contract/notifyStamp";
 
     public static final String APP_ID = "appId";
 

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

@@ -633,12 +633,16 @@ public class PayWalletServiceImpl implements PayWalletService {
             payWalletDO.setCashFreeze(userWalletInfo.getCashAmt().subtract(payUavWalletVO.getCashAmount()));
             payWalletDO.setSalaryAmt(userWalletInfo.getSalaryAmt().add(payUavWalletVO.getSalaryAmount()));
             payWalletDO.setSalaryFreeze(userWalletInfo.getSalaryAmt().subtract(payUavWalletVO.getSalaryAmount()));
-        } else {
+        } else if (payUavWalletVO.getOrderStatus().equals(PayMethodEnums.ORDER_INCOME.getCode())) {
             payLogDO.setPayMethod(payUavWalletVO.getOrderStatus());
             payLogDO.setCashAmtPaid(BigDecimal.ZERO);
             payLogDO.setSalaryAmtPaid(payUavWalletVO.getSalaryAmount());
             // 订单收益
             payWalletDO.setSalaryAmt(userWalletInfo.getSalaryAmt().add(payUavWalletVO.getSalaryAmount()));
+        } else {
+            // 确认收货，解冻用户钱包信息
+            payWalletDO.setSalaryFreeze(userWalletInfo.getSalaryFreeze().subtract(payUavWalletVO.getSalaryAmount()));
+            payWalletDO.setCashFreeze(userWalletInfo.getCashFreeze().subtract(payUavWalletVO.getCashAmount()));
         }
         payWalletDao.insertPayLogDO(payLogDO);
         payWalletDao.updatePayWallet(payWalletDO);