提现状态

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/dto/wallet/PayWalletDTO.java

@@ -40,6 +40,8 @@ public class PayWalletDTO implements Serializable {
     private BigDecimal totalSalary;
     @ApiModelProperty(value = "已提现的金额")
     private BigDecimal rebateWdl;
+    @ApiModelProperty(value = "提现冻结金额")
+    private BigDecimal wdlFreeze;
     @ApiModelProperty(value = "冻结总额")
     private BigDecimal totalFreeze;
     @ApiModelProperty(value = "总金额")

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/dto/wallet/WithdrawalApplyDTO.java

@@ -27,7 +27,7 @@ public class WithdrawalApplyDTO implements Serializable {
     private Integer userAccountId;
     @ApiModelProperty(value = "申请金额")
     private BigDecimal applyAmt;
-    @ApiModelProperty(value = "状态: 0平台处理中 1提现成功 2提现失败")
+    @ApiModelProperty(value = "申请状态: 0平台处理中 1提现成功 2提现失败")
     private Integer applyStatus;
     @ApiModelProperty(value = "开户人")
     private String empName;
@@ -45,6 +45,8 @@ public class WithdrawalApplyDTO implements Serializable {
     private String settleType;
     @ApiModelProperty(value = "处理信息")
     private String tradeResult;
+    @ApiModelProperty(value = "apply 提现申请 await待发放 handle交易中 success 交易成功 failure 交易失败")
+    private String tradeStatus;
     @ApiModelProperty(value = "创建时间")
     private Date createTime;
 

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/qo/wallet/WithdrawalApplyQO.java

@@ -32,8 +32,8 @@ public class WithdrawalApplyQO implements Serializable {
     @ApiModelProperty(value = "结束时间", example = "2023-08-28 23:59:59")
     private String endTime;
 
-    @ApiModelProperty(value = "状态: 0提现申请中 1提现成功 2提现失败", example = "0")
-    private Integer applyStatus;
+    @ApiModelProperty(value = "状态: apply 提现申请 await待发放 handle交易中 success 交易成功 failure 交易失败", example = "0")
+    private Integer tradeStatus;
 
     @ApiModelProperty(value = "通道标识-微信(wechat)-支付宝(alipay)-银行卡(bank_card)", required = true, example = "wechat")
     private String settleType;

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/entity/wallet/PayWalletDO.java

@@ -72,8 +72,8 @@ public class PayWalletDO implements Serializable {
     public PayWalletDTO buildPayWalletDTO() {
         return PayWalletDTO.builder().id(this.id).userAccountId(this.userAccountId)
                 .cashAmt(this.cashAmt).cashFreeze(this.cashFreeze)
-                .salaryAmt(this.salaryAmt).salaryFreeze(this.salaryFreeze)
-                .rebateWdl(this.salaryWdl).build();
+                .salaryAmt(this.salaryAmt).salaryFreeze(this.salaryFreeze.add(this.wdlFreeze))
+                .rebateWdl(this.salaryWdl).wdlFreeze(this.wdlFreeze).build();
     }
 
     public void defaultValue() {

csm-service/cms-service-user/src/main/resources/mapper/wallet/PayWalletDao.xml

@@ -319,8 +319,8 @@
         from xz_withdrawal_apply
         <where>
             1 = 1
-            <if test="applyStatus != null">
-                and apply_status = #{applyStatus}
+            <if test="tradeStatus != null">
+                and trade_status = #{tradeStatus}
             </if>
             <if test="startTime != null and startTime != '' ">
                 and create_time &gt;=
@@ -382,8 +382,8 @@
         from xz_withdrawal_apply
         <where>
             1 = 1
-            <if test="applyStatus != null">
-                and apply_status = #{applyStatus}
+            <if test="tradeStatus != null">
+                and trade_status = #{tradeStatus}
             </if>
             <if test="startTime != null and startTime != '' ">
                 and create_time &gt;=