Browse Source

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 year ago
parent
commit
043b4b32cf
1 changed files with 1 additions and 1 deletions
  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 View File

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


Loading…
Cancel
Save