diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStatisticsController.java b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStatisticsController.java index b916b0f72..42431acd3 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStatisticsController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStatisticsController.java @@ -162,10 +162,9 @@ public class WxUserStatisticsController extends BaseController { }while (curTime.before(endTime) || curTime.equals(endTime)); for (UserCountVo ucv:wxCountList) { - if(ucv.getIncCount() == null){ - ucv.setTotalCount(0l); + if(ucv.getIncCount() != null){ + startTotal += ucv.getIncCount(); } - startTotal += ucv.getIncCount(); ucv.setTotalCount(startTotal); } @@ -273,10 +272,8 @@ public class WxUserStatisticsController extends BaseController { memCounts.stream().filter(md -> md.getReportTime().equals(sdf.format(ct))).findFirst(); if (opMemUserCountVo.isPresent()) { memUc.setIncCount(opMemUserCountVo.get().getIncCount()); - memUc.setTotalCount(opMemUserCountVo.get().getTotalCount()); } else { memUc.setIncCount(0L); - memUc.setTotalCount(0L); } } memCountList.add(memUc); @@ -290,20 +287,14 @@ public class WxUserStatisticsController extends BaseController { }while (curTime.before(endTime) || curTime.equals(endTime)); - if (memCountList.size() > 0 - && memCountList.get(0).getTotalCount() != null - && memCountList.get(0).getTotalCount() == 0) { + if (memCountList.size() > 0) { WxCUserBasicInfoDto pdto = new WxCUserBasicInfoDto(); pdto.updateTenantInfo(tenantEntity); pdto.setEndTime(startTime); memCountList.get(0).setTotalCount(wxCUserBasicInfoService.findCount(pdto)); } for (int i = 1; i < memCountList.size(); i++){ - if ( memCountList.get(i).getTotalCount() != null && - memCountList.get(i-1).getTotalCount() != null && - memCountList.get(i).getTotalCount() < memCountList.get(i-1).getTotalCount()){ - memCountList.get(i).setTotalCount(memCountList.get(i-1).getTotalCount()); - } + memCountList.get(i).setTotalCount(memCountList.get(i-1).getTotalCount()+memCountList.get(i).getIncCount()); } return new ResultData(memCountList); diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderGroupController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderGroupController.java index a44003521..09f155445 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderGroupController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderGroupController.java @@ -149,19 +149,19 @@ public class WxOrderGroupController extends BaseController { return wxOrderGroupService.queryAttendStatus(wxOrderGroup); } - @ApiOperation(value = "拼团营销分析") - @GetMapping("queryOrderGroupMarketingList") - @ApiImplicitParams({ - @ApiImplicitParam(name = "couponId", value = "couponId", dataType = "String", paramType = "query"), - @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), - @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), - }) - public ResultData queryOrderGroupMarketingList(@ModelAttribute WxOrderGroupMarketing wxOrderGroupMarketing, Integer pageNum, Integer pageSize) { - TenantEntity tenantEntity = getTenantInfo(); - List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); - wxOrderGroupMarketing.updateTenantInfo(tenantEntity); - final PageInfo page = wxOrderGroupService.queryOrderGroupMarketingList(wxOrderGroupMarketing, tenantEntitys, pageNum, pageSize); - return new ResultData(page); - } +// @ApiOperation(value = "拼团营销分析") +// @GetMapping("queryOrderGroupMarketingList") +// @ApiImplicitParams({ +// @ApiImplicitParam(name = "couponId", value = "couponId", dataType = "String", paramType = "query"), +// @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), +// @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), +// }) +// public ResultData queryOrderGroupMarketingList(@ModelAttribute WxOrderGroupMarketing wxOrderGroupMarketing, Integer pageNum, Integer pageSize) { +// TenantEntity tenantEntity = getTenantInfo(); +// List tenantEntitys = wxMallService.getTenantEntitys(tenantEntity); +// wxOrderGroupMarketing.updateTenantInfo(tenantEntity); +// final PageInfo page = wxOrderGroupService.queryOrderGroupMarketingList(wxOrderGroupMarketing, tenantEntitys, pageNum, pageSize); +// return new ResultData(page); +// } }