From 5283ee775b480e2b2a93f7f37ee3910c58b76fa9 Mon Sep 17 00:00:00 2001 From: xiaohu <1901900812@qq.com> Date: Fri, 16 Aug 2024 17:16:33 +0800 Subject: [PATCH 1/3] //OfflineActivity --- .../service/impl/WxOfflineActivityAwardsItemServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityAwardsItemServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityAwardsItemServiceImpl.java index 66e7b9597..32ff8784c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityAwardsItemServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityAwardsItemServiceImpl.java @@ -54,6 +54,9 @@ public class WxOfflineActivityAwardsItemServiceImpl implements WxOfflineActivity awaItem.setMaxAmount(null); awaItem.setPrice(BigDecimal.ZERO); } + if(awaItem.getPrice() == null){ + awaItem.setPrice(BigDecimal.ZERO); + } if(awaItem.getCreateDate() == null){ awaItem.setCreateDate(activityItem.getUpdateDate()); } From f09f6f16003ea93c1ca75a353306ba518b5ab8cb Mon Sep 17 00:00:00 2001 From: xiaohu <1901900812@qq.com> Date: Fri, 16 Aug 2024 17:54:01 +0800 Subject: [PATCH 2/3] //OfflineActivity --- .../service/impl/WxOfflineActivityGrantAwardServiceImpl.java | 4 ++++ 1 file changed, 4 insertions(+) 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 29d2e47ae..c67b605e3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java @@ -330,6 +330,7 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity BigDecimal orderMoneySum = BigDecimal.ZERO; List lotteryNumList = new ArrayList<>(); + Integer lotteryCount = 0; List anniversaryLotteryNumList = new ArrayList<>(); for (WxOfflineActivityRecord record : wxOfflineActivityRecords) { if(!EnumOfflineActivityRecordStatus.AUDI_SUCCESS.getCode().equals(record.getAuditStatus())){ @@ -346,6 +347,9 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity if(record.getLotteryNumList() != null && !record.getLotteryNumList().isEmpty()){ lotteryNumList.addAll(record.getLotteryNumList()); } + if(record.getLotteryCount() != null){ + lotteryCount = lotteryCount + record.getLotteryCount(); + } if(StringUtils.isNotBlank(record.getAnniversaryLotteryNum())){ anniversaryLotteryNumList.add(record.getAnniversaryLotteryNum()); } From e14ef6b35a308e088b32fc0192850fd59e63cac8 Mon Sep 17 00:00:00 2001 From: xiaohu <1901900812@qq.com> Date: Fri, 16 Aug 2024 18:00:20 +0800 Subject: [PATCH 3/3] //OfflineActivity --- .../service/impl/WxOfflineActivityGrantAwardServiceImpl.java | 1 + 1 file changed, 1 insertion(+) 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 c67b605e3..6c1f39167 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java @@ -364,6 +364,7 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity if(isForPage){ wxOfflineActivityGrantAward.setLotteryNum(JSON.toJSONString(lotteryNumList)); + wxOfflineActivityGrantAward.setLotteryCount(lotteryCount); wxOfflineActivityGrantAward.setAnniversaryLotteryNum(JSON.toJSONString(anniversaryLotteryNumList)); } }