diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/FutureStocksServiceImpl.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/FutureStocksServiceImpl.java index 3e1af05..ff16078 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/FutureStocksServiceImpl.java +++ b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/FutureStocksServiceImpl.java @@ -35,7 +35,21 @@ public class FutureStocksServiceImpl implements IFutureStocksService @Override public FutureStocksVo selectFutureStocksById(Long id) { - return futureStocksMapper.selectFutureStocksById(id); + FutureStocksVo futureStocks=futureStocksMapper.selectFutureStocksById(id); + if(futureStocks.getCode()!=null){ + futureStocks.setNameCode(futureStocks.getName()+"("+ futureStocks.getCode()+")"); + }else { + futureStocks.setNameCode(futureStocks.getName()); + } + if(futureStocks.getBankName()!=null){ + futureStocks.setBankNameCode(futureStocks.getBankName()+"("+ StringUtils.getLastNumberChars(4,futureStocks.getBankCode()+")")); + } + if(futureStocks.getBankNameCode()!=null){ + futureStocks.setNameDebitNameCode(futureStocks.getName()+"("+ futureStocks.getCode()+")"+"-"+futureStocks.getBankNameCode()); + }else { + futureStocks.setNameDebitNameCode(futureStocks.getName()+"("+ futureStocks.getCode()+")"); + } + return futureStocks; } /** 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 e412d87..ecc44e6 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 @@ -40,7 +40,10 @@ public class PosMachineServiceImpl implements IPosMachineService @Override public PosMachineVo selectPosMachineById(Long id) { - return posMachineMapper.selectPosMachineById(id); + PosMachineVo posMachine=posMachineMapper.selectPosMachineById(id); + posMachine.setBankNameCode(posMachine.getBankName()+"("+ StringUtils.getLastNumberChars(4,posMachine.getBankCode()+")")); + posMachine.setNameMerchantName(posMachine.getName()+"-"+ posMachine.getMerchantName()+"-"+posMachine.getBankName()+"("+ StringUtils.getLastNumberChars(4,posMachine.getBankCode()+")")); + return posMachine; } /**