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);