diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxUserStructureController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxUserStructureController.java index 0981e82ed..2a1768ae7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxUserStructureController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxUserStructureController.java @@ -211,9 +211,9 @@ public class WxUserStructureController extends BaseController { } - @ApiOperation("查询会员消费频率结构") - @GetMapping("/findUserConsumptionFreqStructure") - public ResultData findUserConsumptionFreqStructure(Date startTime, Date endTime) { + @ApiOperation("查询会员活跃结构") + @GetMapping("/findUserActivityStructure") + public ResultData findUserActivityStructure(Date startTime, Date endTime) { WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); dto.setTenantId(getTenantId()); @@ -224,9 +224,9 @@ public class WxUserStructureController extends BaseController { List tagList = new ArrayList<>(); EnumTag[] tags = { - EnumTag.ID_107, - EnumTag.ID_108, - EnumTag.ID_109 + EnumTag.ID_110, + EnumTag.ID_111, + EnumTag.ID_112 }; for (int i = 0; i < tags.length; i++) { @@ -238,7 +238,7 @@ public class WxUserStructureController extends BaseController { } WxTags tag = new WxTags(); - tag.setName("无消费"); + tag.setName("无记录"); tag.setCount(total); tagList.add(tag); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java index 4a8fe4e98..7ee70ae63 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java @@ -398,20 +398,6 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { return assign(user, EnumTag.ID_58); } - private List assignTypeId21(WxCUserBasicInfo user, WxCUser param) { - List resList = null; - int days = (int) ((new Date().getTime() - param.getCreateDate().getTime()) / (1000*3600*24)); - - float loginRate = (float)param.getLoginCount()/days; - if (loginRate > 1F/4) - resList = assign(user, EnumTag.ID_109); - else if (loginRate > 1F/7) - resList = assign(user, EnumTag.ID_108); - else if (loginRate > 1F/30) - resList = assign(user, EnumTag.ID_107); - return resList; - } - private List assignTypeId18(WxCUserBasicInfo user, WxCUser param) { List resList = null; @@ -469,7 +455,7 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { return resList; } - private List assignTypeId22(WxCUserBasicInfo user, WxCUser param) { + private List assignTypeId21(WxCUserBasicInfo user, WxCUser param) { List resList = null; Calendar c = Calendar.getInstance(); Date endTime = new Date(); @@ -480,15 +466,29 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { float verifiedRate = (float)count/30; if (verifiedRate > 1F/4) - resList = assign(user, EnumTag.ID_112); + resList = assign(user, EnumTag.ID_109); else if (verifiedRate > 1F/7) - resList = assign(user, EnumTag.ID_111); + resList = assign(user, EnumTag.ID_108); else if (verifiedRate > 1F/30) - resList = assign(user, EnumTag.ID_110); + resList = assign(user, EnumTag.ID_107); return resList; } + private List assignTypeId22(WxCUserBasicInfo user, WxCUser param) { + List resList = null; + int days = (int) ((new Date().getTime() - param.getCreateDate().getTime()) / (1000*3600*24)); + + float loginRate = (float)param.getLoginCount()/days; + if (loginRate > 1F/4) + resList = assign(user, EnumTag.ID_112); + else if (loginRate > 1F/7) + resList = assign(user, EnumTag.ID_111); + else if (loginRate > 1F/30) + resList = assign(user, EnumTag.ID_110); + return resList; + } + //打标接口 @Override public List assignTags(List tagIdList, WxCUserBasicInfo user) {