From c45230c178f550ef8cccb514335ba9b9ae8f2f51 Mon Sep 17 00:00:00 2001 From: winter Date: Sun, 21 Apr 2024 23:53:43 +0800 Subject: [PATCH] fix --- .../iformall/domain/po/WxRaffleActivityRecord.java | 12 +++++------- .../service/impl/WxRaffleActivityServiceImpl.java | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRaffleActivityRecord.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRaffleActivityRecord.java index b136ba288..5941125f4 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRaffleActivityRecord.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRaffleActivityRecord.java @@ -100,22 +100,20 @@ public class WxRaffleActivityRecord extends TenantEntity { return null; } - public List generateItemIds() { + public void generateItemIds() { if (null != recordItemList && recordItemList.size() > 0 ) { - List itemIdList = new ArrayList(); + recordItemIdList = new ArrayList(); for (int i = 0 ; i < recordItemList.size() ; i++) { WxRaffleActivityRecordItem ri = recordItemList.get(i); - itemIdList.add(ri.getId()); + recordItemIdList.add(ri.getItemId()); } - return itemIdList; } - return null; } public static Map generateExcelTitle(Map itemMap) { Map excelTitle = new LinkedHashMap(); excelTitle.put("activityName", "活动名称"); - excelTitle.put("merchantId", "商户id"); + excelTitle.put("merchantName", "商户名称"); excelTitle.put("orderNo", "订单号"); excelTitle.put("orderMoney", "订单金额"); excelTitle.put("cusName", "客户姓名"); @@ -137,7 +135,7 @@ public class WxRaffleActivityRecord extends TenantEntity { public Map generateExcelData(Map itemMap) { Map excelObject = new HashMap(); excelObject.put("activityName", activityName); - excelObject.put("merchantId", merchantId); + excelObject.put("merchantName", merchantName); excelObject.put("orderNo", orderNo); excelObject.put("orderMoney", orderMoney); excelObject.put("cusName", cusName); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRaffleActivityServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRaffleActivityServiceImpl.java index 0849ef09b..73a173fce 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRaffleActivityServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRaffleActivityServiceImpl.java @@ -186,7 +186,7 @@ public class WxRaffleActivityServiceImpl implements WxRaffleActivityService { _r.setItemDetail(_r.generateItemDetaiJson()); if (null != oneActivityExeclList && null != oneAcitvityId) { - _r.setRecordItemIdList(_r.generateItemIds()); + _r.generateItemIds(); oneActivityExeclList.add(_r.generateExcelData(itemMap)); } }