|
|
@@ -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); |
|
|
|