From ec7c95d0314272d3ac6662fc5ad4bf2fe2fa973a Mon Sep 17 00:00:00 2001 From: winter Date: Fri, 17 May 2024 07:47:26 +0800 Subject: [PATCH] fix --- .../domain/po/WxRaffleActivityRecord.java | 48 ++++++++++--------- .../impl/WxRaffleActivityServiceImpl.java | 8 ++-- 2 files changed, 30 insertions(+), 26 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 1f6198894..2172ac386 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRaffleActivityRecord.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRaffleActivityRecord.java @@ -160,29 +160,31 @@ public class WxRaffleActivityRecord extends TenantEntity { recordItemSizeMap = new HashMap(); for (int i = 0 ; i < recordItemList.size() ; i++) { WxRaffleActivityRecordItem ri = recordItemList.get(i); - String key = this.id+"&"+ri.getItemId(); - if (recordItemIdCountMap.containsKey(key)) { - Integer c = recordItemIdCountMap.get(key); - c = c + 1; - recordItemIdCountMap.put(key, c); - }else { - recordItemIdCountMap.put(key, 1); - } - - if (recordItemJiangQuanCountMap.containsKey(key)) { - String jq = recordItemJiangQuanCountMap.get(key); - jq = jq + ","+ri.getCode(); - recordItemJiangQuanCountMap.put(key, jq); - }else { - recordItemJiangQuanCountMap.put(key, ri.getCode()); - } - - if (recordItemSizeMap.containsKey(key)) { - Integer is = recordItemSizeMap.get(key); - is = is + ri.getItemSize(); - recordItemSizeMap.put(key, is); - }else { - recordItemSizeMap.put(key, ri.getItemSize()); + if (null != ri.getItemId()) { + String key = this.id+"&"+ri.getItemId(); + if (recordItemIdCountMap.containsKey(key)) { + Integer c = recordItemIdCountMap.get(key); + c = c + 1; + recordItemIdCountMap.put(key, c); + }else { + recordItemIdCountMap.put(key, 1); + } + + if (recordItemJiangQuanCountMap.containsKey(key)) { + String jq = recordItemJiangQuanCountMap.get(key); + jq = jq + ","+ri.getCode(); + recordItemJiangQuanCountMap.put(key, jq); + }else { + recordItemJiangQuanCountMap.put(key, ri.getCode()); + } + + if (recordItemSizeMap.containsKey(key)) { + Integer is = recordItemSizeMap.get(key); + is = is + ri.getItemSize(); + recordItemSizeMap.put(key, is); + }else { + recordItemSizeMap.put(key, ri.getItemSize()); + } } } } 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 68225dd00..5dd260333 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRaffleActivityServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRaffleActivityServiceImpl.java @@ -575,9 +575,11 @@ public class WxRaffleActivityServiceImpl implements WxRaffleActivityService { if (null != itemMap) { for (int j = 0 ; j < _riList.size() ; j++) { WxRaffleActivityRecordItem ari = _riList.get(j); - WxRaffleActivityItem ai = itemMap.get(ari.getItemId()); - if (null != ai) { - ari.setItemName(ai.getName()); + if (null != ari.getItemId()) { + WxRaffleActivityItem ai = itemMap.get(ari.getItemId()); + if (null != ai) { + ari.setItemName(ai.getName()); + } } } }