diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/AccountsTransferRecord.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/AccountsTransferRecord.java index 98a388a..587f191 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/AccountsTransferRecord.java +++ b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/AccountsTransferRecord.java @@ -1,13 +1,12 @@ package com.ruoyi.invest.domain; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.core.annotation.Excel; import com.ruoyi.common.core.web.domain.BaseEntity; -import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import javax.validation.constraints.*; +import lombok.Data; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; /** * 账户转账记录对象 accounts_transfer_record * @@ -65,6 +64,15 @@ public class AccountsTransferRecord extends BaseEntity /** 删除标志(0代表存在 1代表删除) */ private String delFlag; + /** 刷卡费率 */ + @ApiModelProperty(value="刷卡费率") + private Double rate; + + + /** 刷卡费率+ */ + @ApiModelProperty(value="刷卡费率+") + private Integer ratePlus; + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/AccountsTransferRecordServiceImpl.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/AccountsTransferRecordServiceImpl.java index e336cc4..57b74d2 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/AccountsTransferRecordServiceImpl.java +++ b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/AccountsTransferRecordServiceImpl.java @@ -160,7 +160,7 @@ public class AccountsTransferRecordServiceImpl implements IAccountsTransferRecor accountsTransferRecord.setInAccountId(pos.getDebitCard()); //信用卡 BankCardLendVo creditVo=bankCardLendMapper.selectBankCardLendById(accountsTransferRecord.getOutAccountId()); - Double commission=pos.getRate()*accountsTransferRecord.getAmount()+pos.getRatePlus(); + Double commission=accountsTransferRecord.getRate()*accountsTransferRecord.getAmount()+accountsTransferRecord.getRatePlus(); BigDecimal bg = BigDecimal.valueOf(commission); commission = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); //手续费