提现状态的回显

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/fdd/UserFddAuthController.java

@@ -16,10 +16,10 @@ import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
 /**
- * @author:zhenjie Date:2022/9/1
+ * @author:lw Date:2022/9/1
  * time:15:44
  */
-@Api(tags = {"小程序-fdd用户认证" })
+@Api(tags = {"fdd用户认证" })
 @RestController
 @RequestMapping("/fdd/")
 public class UserFddAuthController extends BaseController {

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

@@ -2,6 +2,7 @@ package com.mmc.iuav.user.entity;
 
 import com.mmc.iuav.user.entity.wallet.UserBillingDetailVO;
 import com.mmc.iuav.user.enums.SettleTypeEnum;
+import com.mmc.iuav.user.enums.XzEnums;
 import com.mmc.iuav.user.model.dto.wallet.WithdrawalApplyDTO;
 import com.mmc.iuav.user.model.vo.XzWithdrawalVO;
 import com.mmc.iuav.user.model.vo.wallet.ApplyWithdrawalVO;
@@ -92,16 +93,28 @@ public class XzWithdrawalApplyDO implements Serializable {
     public UserBillingDetailVO buildUserBillingDetailVO() {
         payAccount = PrivacyUtil.encryptBankAcct(payAccount);
         String name = "提现";
-        if (this.applyStatus == 0) {
-            name = "平台处理中";
-        } else if (this.applyStatus == 1) {
-            name = "审批通过";
+        if (this.tradeStatus.equals(XzEnums.apply.getCode())) {
+            name = XzEnums.apply.getName();
+        } else if (this.tradeStatus.equals(XzEnums.await.getCode())) {
+            name = XzEnums.await.getName();
+        } else if (this.tradeStatus.equals(XzEnums.handle.getCode())) {
+            name = XzEnums.handle.getName();
+        } else if (this.tradeStatus.equals(XzEnums.failure.getCode())) {
+            name = XzEnums.failure.getName();
+        } else if (this.tradeStatus.equals(XzEnums.success.getCode())) {
+            name = XzEnums.success.getName();
         } else if (this.applyStatus == 2) {
-            name = "审批未通过";
+            name = "提现审批未通过";
+        }
+        BigDecimal salaryAmtPaid;
+        if (this.tradeStatus.equals(XzEnums.failure.getCode()) || this.applyStatus == 2) {
+            salaryAmtPaid = new BigDecimal(payAmount).negate();
+        } else {
+            salaryAmtPaid = new BigDecimal(payAmount);
         }
         return UserBillingDetailVO.builder().userAccountId(userAccountId)
-                .payNo(outerTradeNo).payTime(payTime).account(payAccount)
-                .name(name).id(id).salaryAmtPaid(new BigDecimal(payAmount)).build();
+                .payNo(outerTradeNo).payTime(payTime).account(payAccount).name(name).id(id)
+                .salaryAmtPaid(salaryAmtPaid).tradeResult(tradeResult).build();
     }
 
     public WithdrawalApplyDTO buildWithdrawalApplyDTO() {

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

@@ -40,6 +40,8 @@ public class UserBillingDetailVO implements Serializable {
     private Date payTime;
     @ApiModelProperty(value = "操作名称")
     private String name;
+    @ApiModelProperty(value = "交易说明")
+    private String tradeResult;
     @ApiModelProperty(value = "到账账户")
     private String account;
     @ApiModelProperty(value = "处理进度")

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/enums/XzEnums.java

@@ -7,8 +7,9 @@ package com.mmc.iuav.user.enums;
  */
 public enum XzEnums {
     submit_result("submitResult", "上报结果通知"), trade_result("tradeResult", "交易结果通知"),
-    await("await", "待发放（交易排队中-过渡状态）"), handle("handle", "交易中"), success("success", "交易成功"),
-    failure("failure", "交易失败"), is_success("isSuccess", "交易是否成功"), T("T", "回调code"), F("F", "回调code");
+    await("await", "待发放"), handle("handle", "交易中"), success("success", "提现成功"),
+    failure("failure", "提现失败"), is_success("isSuccess", "交易是否成功"), T("T", "回调code"), F("F", "回调code"),
+    apply("apply", "提现申请"), cancel("cancel", "撤销"), pay("pay", "支付"), refund("refund", "退款");
 
     private String code;
     private String name;

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

@@ -218,6 +218,12 @@ public class WithdrawalServiceImpl implements WithdrawalService {
             }
         } else {
             // 审批未通过 退回金额 解除冻结
+            // 更新提现申请记录
+            XzWithdrawalApplyDO xzWithdrawalApplyDO = new XzWithdrawalApplyDO();
+            xzWithdrawalApplyDO.setOuterTradeNo(applyInfo.getOuterTradeNo());
+            xzWithdrawalApplyDO.setTradeResult("审批未通过");
+            xzWithdrawalApplyDO.setTradeStatus("approve");
+            payWalletDao.updateWithdrawalApply(xzWithdrawalApplyDO);
             int updateCount = rollbackPayWallet(applyInfo, wallet);
             if (updateCount != 1) {
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();