Merge branch 'master-v4' of http://47.96.225.205:8888/r/flowerbackend-v2 in...

cloudroam

2024-11-01 e73d51df2fc2fc369c02eff3571a76f75b98a8ba

Merge branch 'master-v4' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v4

 src/main/java/com/mzl/flower/constant/Constants.java

@@ -635,19 +635,19 @@
        }
    }

    public enum WALLET_WITHDRAW_STATE {
        WAITING("提现中"),SUCCESS("提现成功"),FAILURE("提现失败");

        WALLET_WITHDRAW_STATE(String desc) {
            this.desc = desc;
        }

        private String desc;

        public String getDesc() {
            return desc;
        }
    }
//    public enum WALLET_WITHDRAW_STATE {
//        WAITING("提现中"),SUCCESS("提现成功"),FAILURE("提现失败");
//
//        WALLET_WITHDRAW_STATE(String desc) {
//            this.desc = desc;
//        }
//
//        private String desc;
//
//        public String getDesc() {
//            return desc;
//        }
//    }

    public enum WALLET_WITHDRAW_METHOD {
        WEIXIN("微信");

 src/main/java/com/mzl/flower/dto/response/wallet/WalletWithdrawRecordVO.java

@@ -31,7 +31,7 @@
    private String withdrawTypeStr;

    @ApiModelProperty(value = "提现状态（提现中、提现成功、提现失败）")
    @DictTrans(target = "withdrawStateStr", codeType = "WALLET_WITHDRAW_STATE")
    @DictTrans(target = "withdrawStateStr", codeType = "BILL_WITHDRAW_TYPE")
    private String withdrawState;

    private String withdrawStateStr;

 src/main/java/com/mzl/flower/service/impl/wallet/WalletBillRecordServiceImpl.java

@@ -137,7 +137,7 @@
                //回写提现状态
                if (StringUtils.isEmpty(walletBillRecordDO.getWithdrawRecordId())) {
                    WalletWithdrawRecordDO withdrawRecordDO = walletWithdrawRecordMapper.selectById(walletBillRecordDO.getWithdrawRecordId());
                    withdrawRecordDO.setWithdrawState(Constants.WALLET_WITHDRAW_STATE.SUCCESS.name());
                    withdrawRecordDO.setWithdrawState(Constants.BILL_WITHDRAW_TYPE.success.name());
                    walletBillRecordDO.setRemark("账户资金提现完成");
                    walletWithdrawRecordMapper.updateById(withdrawRecordDO);
                }
@@ -184,7 +184,7 @@
                //回写提现状态
                if (StringUtils.isEmpty(walletBillRecordDO.getWithdrawRecordId())) {
                    WalletWithdrawRecordDO withdrawRecordDO = walletWithdrawRecordMapper.selectById(walletBillRecordDO.getWithdrawRecordId());
                    withdrawRecordDO.setWithdrawState(Constants.WALLET_WITHDRAW_STATE.FAILURE.name());
                    withdrawRecordDO.setWithdrawState(Constants.BILL_WITHDRAW_TYPE.fail.name());
                    walletBillRecordDO.setRemark("账户资金提现失败");
                    walletWithdrawRecordMapper.updateById(withdrawRecordDO);
                }

 src/main/java/com/mzl/flower/service/impl/wallet/WalletWithdrawRecordServiceImpl.java

@@ -125,7 +125,7 @@
                    withdrawRecordDO.setBalance(walletDO.getWithdrawableAmount().subtract(dto.getAmount()));
                    withdrawRecordDO.setAmount(dto.getAmount());
                    withdrawRecordDO.setSupplierId(supplierDTO.getId());
                    withdrawRecordDO.setWithdrawState(Constants.WALLET_WITHDRAW_STATE.WAITING.name());
                    withdrawRecordDO.setWithdrawState(Constants.BILL_WITHDRAW_TYPE.start.name());
                    withdrawRecordDO.setMethod(Constants.WALLET_WITHDRAW_METHOD.WEIXIN.name());
                    withdrawRecordDO.setWithdrawType(Constants.WALLET_WITHDRAW_TYPE.BALANCE.name());
                    // 待审核状态
@@ -210,7 +210,7 @@
        withdrawRecordDO.setApproveTime(LocalDateTime.now());
        if(Constants.WALLET_APPROVE_STATE.REJECT.name().equals(walletWithdrawRecordDTO.getApproveState())){
            //如果拒绝直接提现失败
            withdrawRecordDO.setWithdrawState(Constants.WALLET_WITHDRAW_STATE.FAILURE.name());
            withdrawRecordDO.setWithdrawState(Constants.BILL_WITHDRAW_TYPE.fail.name());
        }
        walletWithdrawRecordMapper.updateById(withdrawRecordDO);