From df3aabe287a8d7d34d3217c5be76c47e6dbfb075 Mon Sep 17 00:00:00 2001 From: panshuling321 Date: Thu, 28 Apr 2022 13:53:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=B8=85=E5=88=86=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E9=BB=98=E8=AE=A4=E8=BF=90=E8=90=A5=E5=95=86=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/XhpcClearingHistoryOrderServiceImpl.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcClearingHistoryOrderServiceImpl.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcClearingHistoryOrderServiceImpl.java index 94cd09cd..77d217c5 100644 --- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcClearingHistoryOrderServiceImpl.java +++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcClearingHistoryOrderServiceImpl.java @@ -4,10 +4,8 @@ import cn.hutool.core.io.IoUtil; import cn.hutool.poi.excel.ExcelUtil; import cn.hutool.poi.excel.ExcelWriter; import com.xhpc.activity.domain.XhpcClearingHistoryOrderDomain; -import com.xhpc.activity.mapper.XhpcClearingBankMapper; -import com.xhpc.activity.mapper.XhpcClearingCheckoutMapper; -import com.xhpc.activity.mapper.XhpcClearingHistoryOrderMapper; -import com.xhpc.activity.mapper.XhpcHistoryOrderMapper; +import com.xhpc.activity.domain.XhpcOperatorDomain; +import com.xhpc.activity.mapper.*; import com.xhpc.activity.service.XhpcClearingHistoryOrderService; import com.xhpc.activity.vo.ClearingOrderVo; import com.xhpc.common.core.exception.CustomException; @@ -40,6 +38,9 @@ public class XhpcClearingHistoryOrderServiceImpl implements XhpcClearingHistoryO @Resource XhpcHistoryOrderMapper orderMapper; + @Resource + XhpcOperatorMapper operatorMapper; + @Override public List getPage(Map params) { @@ -157,6 +158,11 @@ public class XhpcClearingHistoryOrderServiceImpl implements XhpcClearingHistoryO if (bankDomain == null) { bankDomain = new HashMap<>(); + + XhpcOperatorDomain operatorDomain = operatorMapper.selectByPrimaryKey(Long.parseLong(operatorId)); + if(operatorDomain != null){ + bankDomain.put("operatorName", operatorDomain.getName()); + } } bankDomain.put("cashedAmount", cashedAmount);