From cc2992bd128ff1494c1b04cd7937e5a37049853f Mon Sep 17 00:00:00 2001 From: xiaohu <1901900812@qq.com> Date: Fri, 13 Dec 2024 18:16:21 +0800 Subject: [PATCH] //offlineActivity --- .../impl/WxOfflineActivityGrantAwardServiceImpl.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java index 7600c5b68..8a82aa967 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java @@ -890,6 +890,8 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity merchantQ.updateTenantInfo(wxOfflineActivity); Map merchantMap = wxMerchantService.getIdAndNamesMap(merchantQ); + Map merchantShopNumberMap = wxShopService.getMerchantShopNumberMap(merchantQ, null, EnumYesOrNo.NO.getCode()); + Map bussinessMap = wxBusinessService.findAllMap(wxOfflineActivity); MallUserInfo userInfoQ = new MallUserInfo(); @@ -946,6 +948,7 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity orderMap.put("orderNo",offlineActivityGrantRecord.getOrderNo()); orderMap.put("orderMoney",offlineActivityGrantRecord.getOrderMoney()); orderMap.put("merchantName",offlineActivityGrantRecord.getMerchantId()!=null?merchantMap.get(offlineActivityGrantRecord.getMerchantId()):""); + orderMap.put("shopNumber",offlineActivityGrantRecord.getMerchantId()!=null?merchantShopNumberMap.get(offlineActivityGrantRecord.getMerchantId()):""); orderMap.put("businessName",offlineActivityGrantRecord.getBusinessId()!=null?bussinessMap.get(offlineActivityGrantRecord.getBusinessId()).getTitle():""); orderMap.put("createDate",offlineActivityGrantRecord.getCreateDate()); orderMap.put("auditByName",offlineActivityGrantRecord.getAuditBy()!=null?userMap.get(offlineActivityGrantRecord.getAuditBy()).getName():""); @@ -1185,8 +1188,8 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity entity13_list.add(entity13_2); ExcelExportEntity entity13_3 = new ExcelExportEntity("商户名称","merchantName",20); entity13_list.add(entity13_3); -// ExcelExportEntity entity13_4 = new ExcelExportEntity("铺位号","shopNumber",20); -// entity13_list.add(entity13_4); + ExcelExportEntity entity13_4 = new ExcelExportEntity("铺位号","shopNumber",20); + entity13_list.add(entity13_4); ExcelExportEntity entity13_5 = new ExcelExportEntity("业态","businessName",20); entity13_list.add(entity13_5); ExcelExportEntity entity13_6 = new ExcelExportEntity("提交时间","createDate",20);