Преглед на файлове

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 година
родител
ревизия
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);


Зареждане…
Отказ
Запис