|
|
|
@@ -890,6 +890,8 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity |
|
|
|
merchantQ.updateTenantInfo(wxOfflineActivity); |
|
|
|
Map<Long, String> merchantMap = wxMerchantService.getIdAndNamesMap(merchantQ); |
|
|
|
|
|
|
|
Map<Long, String> merchantShopNumberMap = wxShopService.getMerchantShopNumberMap(merchantQ, null, EnumYesOrNo.NO.getCode()); |
|
|
|
|
|
|
|
Map<Integer, WxBusiness> 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); |
|
|
|
|