Просмотр исходного кода

Merge branch 'release_toaliyun_real' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real

release_toaliyun_real
winter 1 год назад
Родитель
Сommit
1b3225d042
2 измененных файлов: 8 добавлений и 0 удалений
  1. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityAwardsItemServiceImpl.java
  2. +5
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java

+ 3
- 0
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());
}


+ 5
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java Просмотреть файл

@@ -330,6 +330,7 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity

BigDecimal orderMoneySum = BigDecimal.ZERO;
List<String> lotteryNumList = new ArrayList<>();
Integer lotteryCount = 0;
List<String> 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));
}
}


Загрузка…
Отмена
Сохранить