diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivitySettlementController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivitySettlementController.java index d1fb8f257..354eddbbe 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivitySettlementController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivitySettlementController.java @@ -98,6 +98,25 @@ public class WxOfflineActivitySettlementController extends BaseController { return new ResultData(recordList); } + @ApiOperation("单个活动单个门店结算汇总") + @GetMapping("merchantSettlementStatistics") + @ApiImplicitParams({}) + public ResultData merchantSettlementStatistics(@ModelAttribute WxOfflineActivityGrantSettlement grantSettlement) { + + if(grantSettlement.getActivityId() == null){ + return new ResultData(Result.ERROR,"请选择活动"); + } + if(grantSettlement.getMerchantId() == null){ + return new ResultData(Result.ERROR,"请选择门店"); + } + + TenantEntity tenantInfo = getTenantInfo(); + grantSettlement.updateTenantInfo(tenantInfo); + Map recordList = wxOfflineActivityGrantSettlementService.merchantSettlementStatistics(grantSettlement); + + return new ResultData(recordList); + } + @ApiOperation("单个活动单个门店结算列表") @GetMapping("merchantSettlement") @ApiImplicitParams({}) diff --git a/mallinkService/src/main/java/com/iformall/service/WxOfflineActivityGrantSettlementService.java b/mallinkService/src/main/java/com/iformall/service/WxOfflineActivityGrantSettlementService.java index 781dce69f..3fb8993ad 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxOfflineActivityGrantSettlementService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxOfflineActivityGrantSettlementService.java @@ -28,7 +28,10 @@ public interface WxOfflineActivityGrantSettlementService { List getActivitySettlement(WxOfflineActivityGrantSettlement grantSettlement); + Map merchantSettlementStatistics(WxOfflineActivityGrantSettlement grantSettlement); + List findList(WxOfflineActivityGrantSettlement grantSettlement); void exportData(HttpServletRequest request, HttpServletResponse response, WxOfflineActivityGrantSettlement grantSettlement); + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantSettlementServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantSettlementServiceImpl.java index 4d1ca7af4..92c1c5d88 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantSettlementServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantSettlementServiceImpl.java @@ -258,6 +258,41 @@ public class WxOfflineActivityGrantSettlementServiceImpl implements WxOfflineAct return activitySettlementList; } + @Override + public Map merchantSettlementStatistics(WxOfflineActivityGrantSettlement grantSettlement) { + Map result = new HashMap<>(); + WxOfflineActivity activity = wxOfflineActivityMapper.selectById(grantSettlement.getActivityId(),grantSettlement.getTenantId()); + if(activity == null){ + result.put("activityName","查无此活动"); + }else{ + result.put("activityName",activity.getName()); + } + WxMerchant merchant = wxMerchantMapper.selectById(grantSettlement.getMerchantId()); + if(merchant == null){ + result.put("merchantName","查无此门店"); + }else{ + result.put("merchantName",merchant.getName()); + } + List activitySettlementList = wxOfflineActivityGrantSettlementMapper.getActivitySettlement(grantSettlement); + if (activitySettlementList != null && !activitySettlementList.isEmpty()) { + result.put("recordCount",0); + result.put("sumOrderMoney",0); + result.put("sumGrantPrice",0); + result.put("sumMallPrice",0); + result.put("sumMerchantPrice",0); + return result; + }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()); + } + + return result; + } + @Override public List findList(WxOfflineActivityGrantSettlement grantSettlement) { return wxOfflineActivityGrantSettlementMapper.findList(grantSettlement); diff --git a/mallinkService/src/main/resources/mapper/WxOfflineActivityGrantSettlementMapper.xml b/mallinkService/src/main/resources/mapper/WxOfflineActivityGrantSettlementMapper.xml index 12f7d3939..521b81499 100644 --- a/mallinkService/src/main/resources/mapper/WxOfflineActivityGrantSettlementMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOfflineActivityGrantSettlementMapper.xml @@ -179,6 +179,9 @@ and `create_date` <= #{createDateEnd} + + and `merchant_id` = #{merchantId} + and merchant_id in