Merge remote-tracking branch 'origin/master'

doum

21 小时以前 1382e80f33270e77e06414ce8ad3f085fde6142a

Merge remote-tracking branch 'origin/master'

 server/dmmall_service/src/main/java/com/doumee/dao/business/model/InviteRecord.java

@@ -37,7 +37,6 @@
    private Integer editor;

    @ApiModelProperty(value = "更新时间")

    private Date editDate;

    @ApiModelProperty(value = "是否删除0否 1是", example = "1")
@@ -73,8 +72,6 @@
    @ApiModelProperty(value = "邀请完成首单奖励优惠券名称 多个以,分割")
    @ExcelColumn(name="奖励邀请人优惠券" ,index =6,width = 10 )
    private String couponNames;



    @ApiModelProperty(value = "被邀请人头像")
    @TableField(exist = false)

 server/dmmall_service/src/main/java/com/doumee/dao/business/model/WithdrawRecord.java

@@ -67,6 +67,17 @@
    @ExcelColumn(name="提现金额")
    private BigDecimal amount;

    @ApiModelProperty(value = "银行名称")
    @ExcelColumn(name="银行名称")
    private String bankName;

    @ApiModelProperty(value = "银行账户")
    @ExcelColumn(name="银行账户")
    private String bankAccount;

    @ApiModelProperty(value = "开户人姓名")
    @ExcelColumn(name="开户人姓名")
    private String name;


    @ApiModelProperty(value = "银行主键（关联 member_bank 表）", example = "1")
@@ -93,10 +104,6 @@
    @ApiModelProperty(value = "打款银行")
    @ExcelColumn(name="打款银行")
    private String payBank;

    @ApiModelProperty(value = "提现银行名称", example = "1")
    @TableField(exist = false)
    private String bankName;

    @ApiModelProperty(value = "打款凭证", example = "1")
    @TableField(exist = false)

 server/dmmall_service/src/main/java/com/doumee/service/business/impl/WithdrawRecordServiceImpl.java

@@ -109,10 +109,6 @@
        if (Objects.isNull(withdrawRecord)) {
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        MemberBank memberBank = memberBankMapper.selectById(withdrawRecord.getBankId());
        if(Objects.nonNull(memberBank)){
            withdrawRecord.setBankName(memberBank.getBankName());
        }
        if(!Constants.equalsInteger(withdrawRecord.getStatus(), Constants.ZERO)){
            String path = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode() +
                    systemDictDataBiz.queryByCode(Constants.OSS, Constants.TRANSFER_FILE).getCode();
@@ -234,6 +230,10 @@
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"商户余额不足");
        }

        MemberBank memberBank = memberBankMapper.selectById(request.getBankId());
        if(Objects.isNull(memberBank)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到收款银行信息");
        }
        WithdrawRecord withdrawRecord = new WithdrawRecord();
        withdrawRecord.setCreateDate(new Date());
        withdrawRecord.setIsdeleted(Constants.ZERO);
@@ -243,6 +243,9 @@
        withdrawRecord.setMemberId(request.getMemberId());
        withdrawRecord.setCode(this.getNextInCode());
        withdrawRecord.setStatus(Constants.ZERO);
        withdrawRecord.setBankName(memberBank.getBankName());
        withdrawRecord.setName(memberBank.getName());
        withdrawRecord.setBankAccount(memberBank.getBankAccount());
        withdrawRecordMapper.insert(withdrawRecord);

        DealIntegralRequest dealIntegralRequest = new DealIntegralRequest();