fix: 冲突

cloudroam

2024-10-23 8c469898c0a71224e17780696d47581de47c9ed7

fix: 冲突

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

@@ -603,9 +603,23 @@
        }
    }

    public enum WALLET_WITHDRAW_STATE {
    public enum WALLET_APPROVE_STATE {
        WAITING("待审核"), APPROVE("已通过"),REJECT("已拒绝");

        WALLET_APPROVE_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;
        }

 src/main/java/com/mzl/flower/dto/request/wallet/QueryWalletDTO.java

@@ -36,5 +36,7 @@
    @DateTimeFormat(pattern="yyyy-MM-dd")
    private LocalDate approveEndDate;

    @ApiModelProperty(value = "提现状态")
    private String withdrawState;

}

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

@@ -36,7 +36,7 @@
    private LocalDateTime approveTime;

    @ApiModelProperty(value = "审核状态（待审核、已通过、已拒绝）")
    private Integer approveState;
    private String approveState;

    @ApiModelProperty(value = "不通过原因")
    private String rejectReason;

 src/main/java/com/mzl/flower/entity/wallet/WalletWithdrawRecordDO.java

@@ -66,8 +66,8 @@
    /**
     * 审核状态
     */
    @ApiModelProperty(value = "审核状态（待审核、审核通过、审核不通过）")
    private Integer approveState;
    @ApiModelProperty(value = "审核状态（待审核、已通过、已拒绝）")
    private String approveState;

    /**
     * 不通过原因

 src/main/resources/mapper/wallet/WalletWithdrawRecordMapper.xml

@@ -30,6 +30,9 @@
        <if test="dto.supplierId != null and dto.supplierId != ''">
            and t.supplier_id = #{dto.supplierId}
        </if>
        <if test="dto.withdrawState != null and dto.withdrawState != ''">
            and t.withdraw_state = #{dto.withdrawState}
        </if>
        <if test="dto.createStartDate!=null ">
            <![CDATA[
               AND t.create_time >= #{dto.createStartDate}