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 7201644..755d7b5 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 @@ -15,6 +15,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.math.BigDecimal; import java.util.List; /** @@ -42,9 +43,11 @@ public class PosMachineServiceImpl implements IPosMachineService public PosMachineVo selectPosMachineById(Long id) { PosMachineVo posMachine=posMachineMapper.selectPosMachineById(id); - posMachine.setRateName(posMachine.getRate()*100+"%"); + //存入数据时,按实际来,需要重新计算下 + BigDecimal bg = BigDecimal.valueOf(posMachine.getRate()); + posMachine.setRateName(bg.multiply(new BigDecimal(100)).doubleValue()+"%"); //展示的时候乘以100 - posMachine.setRate(posMachine.getRate()*100); + posMachine.setRate(bg.multiply(new BigDecimal(100)).doubleValue()); posMachine.setBankNameCode(posMachine.getBankName()+"("+ StringUtils.getLastNumberChars(4,posMachine.getBankCode()+")")); posMachine.setNameMerchantName(posMachine.getName()+"-"+ posMachine.getMerchantName()+"-"+posMachine.getBankName()+"("+ StringUtils.getLastNumberChars(4,posMachine.getBankCode()+")")); return posMachine; @@ -63,9 +66,11 @@ public class PosMachineServiceImpl implements IPosMachineService List posMachineVoList= posMachineMapper.selectPosMachineList(posMachineDto); //修改名称加卡号 for (PosMachineVo posMachine : posMachineVoList) { - posMachine.setRateName(posMachine.getRate()*100+"%"); + //存入数据时,按实际来,需要重新计算下 + BigDecimal bg = BigDecimal.valueOf(posMachine.getRate()); + posMachine.setRateName(bg.multiply(new BigDecimal(100)).doubleValue()+"%"); //展示的时候乘以100 - posMachine.setRate(posMachine.getRate()*100); + posMachine.setRate(bg.multiply(new BigDecimal(100)).doubleValue()); posMachine.setBankNameCode(posMachine.getBankName()+"("+ StringUtils.getLastNumberChars(4,posMachine.getBankCode()+")")); posMachine.setNameMerchantName(posMachine.getName()+"-"+ posMachine.getMerchantName()+"-"+posMachine.getBankName()+"("+ StringUtils.getLastNumberChars(4,posMachine.getBankCode()+")")); } @@ -86,7 +91,8 @@ public class PosMachineServiceImpl implements IPosMachineService posMachine.setCreateTime(DateUtils.getNowDate()); posMachine.setId(IdWorker.getId()); //存入数据时,按实际来,需要重新计算下 - posMachine.setRate(posMachine.getRate()/100); + BigDecimal bg = BigDecimal.valueOf(posMachine.getRate()); + posMachine.setRate(bg.divide(new BigDecimal(100)).doubleValue()); //记账账户信息插入 Accounts accounts=new Accounts(); @@ -120,6 +126,10 @@ public class PosMachineServiceImpl implements IPosMachineService { posMachine.setUpdateBy(SecurityUtils.getUsername()); posMachine.setUpdateTime(DateUtils.getNowDate()); + //存入数据时,按实际来,需要重新计算下 + BigDecimal bg = BigDecimal.valueOf(posMachine.getRate()); + posMachine.setRate(bg.divide(new BigDecimal(100)).doubleValue()); + Accounts accounts = new Accounts(); BeanUtils.copyProperties(posMachine, accounts); accounts.setType("6");