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

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

release_toaliyun_real
winter 1 год назад
Родитель
Сommit
043b4b32cf
1 измененных файлов: 1 добавлений и 1 удалений
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantSettlementServiceImpl.java

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

@@ -290,7 +290,7 @@ public class WxOfflineActivityGrantSettlementServiceImpl implements WxOfflineAct
result.put("merchantName",merchant.getName());
}
List<OfflineActivitySettlement> activitySettlementList = wxOfflineActivityGrantSettlementMapper.getActivitySettlement(grantSettlement);
if (activitySettlementList != null && !activitySettlementList.isEmpty()) {
if (activitySettlementList == null || activitySettlementList.isEmpty()) {
result.put("recordCount",0);
result.put("sumOrderMoney",0);
result.put("sumGrantPrice",0);


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