diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/PosMachine.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/PosMachine.java index dc8ddd5..4ee87c9 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/PosMachine.java +++ b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/PosMachine.java @@ -88,6 +88,11 @@ public class PosMachine extends BaseEntity @Excel(name = "账户状态") private String status; + /** 舍入模式 */ + @ApiModelProperty(value="舍入模式") + @Excel(name = "舍入模式") + private String roundingMode; + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -111,6 +116,7 @@ public class PosMachine extends BaseEntity .append("activationDate", getActivationDate()) .append("ratePlus", getRatePlus()) .append("status", getStatus()) + .append("roundingMode", getRoundingMode()) .toString(); } } diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/PosMachineVo.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/PosMachineVo.java index b196984..d560cf3 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/PosMachineVo.java +++ b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/PosMachineVo.java @@ -1,9 +1,9 @@ package com.ruoyi.invest.domain.vo; import com.ruoyi.invest.domain.PosMachine; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import io.swagger.annotations.ApiModel; /** * pos机信息Vo对象 pos_machine * @@ -26,4 +26,8 @@ public class PosMachineVo extends PosMachine @ApiModelProperty(value="名称+商户)") private String nameMerchantName; + /** 刷卡费率 */ + @ApiModelProperty(value="刷卡费率") + private String rateName; + } 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 79cbd22..37304ca 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 @@ -164,7 +164,20 @@ public class AccountsTransferRecordServiceImpl implements IAccountsTransferRecor BankCardLendVo creditVo=bankCardLendMapper.selectBankCardLendById(accountsTransferRecord.getOutAccountId()); Double commission=accountsTransferRecord.getRate()*accountsTransferRecord.getAmount()+accountsTransferRecord.getRatePlus(); BigDecimal bg = BigDecimal.valueOf(commission); - commission = bg.setScale(2, BigDecimal.ROUND_UP).doubleValue(); + String roudingMode=pos.getRoundingMode() ; + if(roudingMode.equals("1")){ + commission = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); + } + if(roudingMode.equals("2")){ + commission = bg.setScale(2, BigDecimal.ROUND_UP).doubleValue(); + } + if(roudingMode.equals("3")){ + commission = bg.setScale(2, BigDecimal.ROUND_DOWN).doubleValue(); + } + if(roudingMode.equals("4")){ + commission = bg.setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue(); + } + //手续费 accountsTransferRecord.setCommission(commission); //实际入账金额 diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/PosMachineServiceImpl.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/PosMachineServiceImpl.java index 870ab03..7201644 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/PosMachineServiceImpl.java +++ b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/PosMachineServiceImpl.java @@ -42,6 +42,9 @@ public class PosMachineServiceImpl implements IPosMachineService public PosMachineVo selectPosMachineById(Long id) { PosMachineVo posMachine=posMachineMapper.selectPosMachineById(id); + posMachine.setRateName(posMachine.getRate()*100+"%"); + //展示的时候乘以100 + posMachine.setRate(posMachine.getRate()*100); posMachine.setBankNameCode(posMachine.getBankName()+"("+ StringUtils.getLastNumberChars(4,posMachine.getBankCode()+")")); posMachine.setNameMerchantName(posMachine.getName()+"-"+ posMachine.getMerchantName()+"-"+posMachine.getBankName()+"("+ StringUtils.getLastNumberChars(4,posMachine.getBankCode()+")")); return posMachine; @@ -53,15 +56,20 @@ public class PosMachineServiceImpl implements IPosMachineService * @param posMachineDto pos机信息 * @return pos机信息 */ + @Override public List selectPosMachineList(PosMachineDto posMachineDto) { List posMachineVoList= posMachineMapper.selectPosMachineList(posMachineDto); //修改名称加卡号 for (PosMachineVo posMachine : posMachineVoList) { + posMachine.setRateName(posMachine.getRate()*100+"%"); + //展示的时候乘以100 + posMachine.setRate(posMachine.getRate()*100); posMachine.setBankNameCode(posMachine.getBankName()+"("+ StringUtils.getLastNumberChars(4,posMachine.getBankCode()+")")); posMachine.setNameMerchantName(posMachine.getName()+"-"+ posMachine.getMerchantName()+"-"+posMachine.getBankName()+"("+ StringUtils.getLastNumberChars(4,posMachine.getBankCode()+")")); } + return posMachineVoList; } @@ -77,6 +85,8 @@ public class PosMachineServiceImpl implements IPosMachineService posMachine.setCreateBy(SecurityUtils.getUsername()); posMachine.setCreateTime(DateUtils.getNowDate()); posMachine.setId(IdWorker.getId()); + //存入数据时,按实际来,需要重新计算下 + posMachine.setRate(posMachine.getRate()/100); //记账账户信息插入 Accounts accounts=new Accounts(); diff --git a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/PosMachineMapper.xml b/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/PosMachineMapper.xml index 91e3a0d..9bad188 100644 --- a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/PosMachineMapper.xml +++ b/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/PosMachineMapper.xml @@ -27,6 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -51,6 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.merchant_code, a.activation_date, a.status, + a.rounding_mode, bc."name" as bank_name, bc.code as bank_code from @@ -100,6 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" merchant_code, activation_date, status, + rounding_mode, #{id}, @@ -122,6 +125,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{merchantCode}, #{activationDate}, #{status}, + #{roundingMode}, @@ -147,6 +151,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" merchant_code = #{merchantCode}, activation_date = #{activationDate}, status = #{status}, + rounding_mode = #{roundingMode}, where id = #{id}