|
|
|
@@ -245,7 +245,7 @@ public class WxOfflineActivityGrantSettlementServiceImpl implements WxOfflineAct |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public List<OfflineActivitySettlement> getActivitySettlement(WxOfflineActivityGrantSettlement record) { |
|
|
|
public List<OfflineActivitySettlement> getActivitySettlement(OfflineActivitySettlement record) { |
|
|
|
|
|
|
|
if (StringUtils.isNotBlank(record.getMerchantName())) { |
|
|
|
WxMerchant merchant = new WxMerchant(); |
|
|
|
@@ -275,7 +275,7 @@ public class WxOfflineActivityGrantSettlementServiceImpl implements WxOfflineAct |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public Map<String, Object> merchantSettlementStatistics(WxOfflineActivityGrantSettlement grantSettlement) { |
|
|
|
public Map<String, Object> merchantSettlementStatistics(OfflineActivitySettlement grantSettlement) { |
|
|
|
Map<String, Object> result = new HashMap<>(); |
|
|
|
WxOfflineActivity activity = wxOfflineActivityMapper.selectById(grantSettlement.getActivityId(),grantSettlement.getTenantId()); |
|
|
|
if(activity == null){ |
|
|
|
@@ -300,10 +300,10 @@ public class WxOfflineActivityGrantSettlementServiceImpl implements WxOfflineAct |
|
|
|
}else{ |
|
|
|
OfflineActivitySettlement offlineActivitySettlement = activitySettlementList.get(0); |
|
|
|
result.put("recordCount",offlineActivitySettlement.getRecordCount()); |
|
|
|
result.put("sumOrderMoney",offlineActivitySettlement.getRecordCount()); |
|
|
|
result.put("sumGrantPrice",offlineActivitySettlement.getRecordCount()); |
|
|
|
result.put("sumMallPrice",offlineActivitySettlement.getRecordCount()); |
|
|
|
result.put("sumMerchantPrice",offlineActivitySettlement.getRecordCount()); |
|
|
|
result.put("sumOrderMoney",offlineActivitySettlement.getSumOrderMoney()); |
|
|
|
result.put("sumGrantPrice",offlineActivitySettlement.getSumGrantPrice()); |
|
|
|
result.put("sumMallPrice",offlineActivitySettlement.getSumMallPrice()); |
|
|
|
result.put("sumMerchantPrice",offlineActivitySettlement.getSumMerchantPrice()); |
|
|
|
} |
|
|
|
|
|
|
|
return result; |
|
|
|
|