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()); } 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..6c1f39167 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()); } @@ -360,6 +364,7 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity if(isForPage){ wxOfflineActivityGrantAward.setLotteryNum(JSON.toJSONString(lotteryNumList)); + wxOfflineActivityGrantAward.setLotteryCount(lotteryCount); wxOfflineActivityGrantAward.setAnniversaryLotteryNum(JSON.toJSONString(anniversaryLotteryNumList)); } }