Browse Source

/. basicuseradd

release_toaliyun_real
xhxu 4 years ago
parent
commit
1ea79be4cf
2 changed files with 18 additions and 27 deletions
  1. +4
    -13
      mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStatisticsController.java
  2. +14
    -14
      mallinkCApi/src/main/java/com/iformall/controller/WxOrderGroupController.java

+ 4
- 13
mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStatisticsController.java View File

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


+ 14
- 14
mallinkCApi/src/main/java/com/iformall/controller/WxOrderGroupController.java View File

@@ -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<TenantEntity> tenantEntitys = wxMallService.getTenantEntitys(tenantEntity);
wxOrderGroupMarketing.updateTenantInfo(tenantEntity);
final PageInfo<WxOrderGroupMarketing> 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<TenantEntity> tenantEntitys = wxMallService.getTenantEntitys(tenantEntity);
// wxOrderGroupMarketing.updateTenantInfo(tenantEntity);
// final PageInfo<WxOrderGroupMarketing> page = wxOrderGroupService.queryOrderGroupMarketingList(wxOrderGroupMarketing, tenantEntitys, pageNum, pageSize);
// return new ResultData(page);
// }

}

Loading…
Cancel
Save