From e4bbf5b5c29083b606578e7948f6ecd3970d921c Mon Sep 17 00:00:00 2001 From: tianyongbao Date: Tue, 25 Jun 2024 20:53:33 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=87=AA=E6=B5=8B=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=8Cpos=E6=9C=BA=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=92=8C=E6=9C=9F=E8=B4=A7=E8=82=A1=E7=A5=A8=E8=B4=A6=E6=88=B7?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/FutureStocksServiceImpl.java | 16 +++++++++++++++- .../service/impl/PosMachineServiceImpl.java | 5 ++++- 2 files changed, 19 insertions(+), 2 deletions(-) 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; } /**