diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/controller/manager/BackMemberStatisticsController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/controller/manager/BackMemberStatisticsController.java index c34b7ba7..44dfcc64 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/controller/manager/BackMemberStatisticsController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/controller/manager/BackMemberStatisticsController.java @@ -38,6 +38,18 @@ public class BackMemberStatisticsController { redisService.setCacheObject(CacheConstants.TOP_30_ACTIVITY + ETop30Type.AMOUNT.getKey(), flag); return AjaxResult.success(); } + + + @GetMapping("/getShowPeople") + public AjaxResult getShowPeople() { + return AjaxResult.success("操作成功!", redisService.getCacheObject(CacheConstants.TOP_30_ACTIVITY + ETop30Type.PEOPLE.getKey())); + } + + @GetMapping("/getShowAmount") + public AjaxResult getShowAmount() { + return AjaxResult.success("操作成功!", redisService.getCacheObject(CacheConstants.TOP_30_ACTIVITY + ETop30Type.AMOUNT.getKey())); + } + @PostMapping("/topPeople") public AjaxResult topPeople(@RequestBody DirectStatisticsTop30QueryParam param) { param.setFaker(false); diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/MemberStatisticsServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/MemberStatisticsServiceImpl.java index dbaac459..66f5c870 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/MemberStatisticsServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/MemberStatisticsServiceImpl.java @@ -72,8 +72,10 @@ public class MemberStatisticsServiceImpl implements IMemberStatisticsService { result = generateFakeData(list, 30, fakerList, type); } for (DirectStatisticsTop30VO directStatisticsTop30VO : result) { - directStatisticsTop30VO.setMemberCode(DataMaskingUtil.mask(directStatisticsTop30VO.getMemberCode(), 2, 2)); - directStatisticsTop30VO.setMemberName(DataMaskingUtil.mask(directStatisticsTop30VO.getMemberName(), 1, 0)); + if(param.getFaker()){ + directStatisticsTop30VO.setMemberCode(DataMaskingUtil.mask(directStatisticsTop30VO.getMemberCode(), 2, 2)); + directStatisticsTop30VO.setMemberName(DataMaskingUtil.mask(directStatisticsTop30VO.getMemberName(), 1, 0)); + } directStatisticsTop30VO.setNumberOfAmount(directStatisticsTop30VO.getNumberOfAmount().divide(new BigDecimal(10000))); } return result; diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/statis/MemberStatisticsMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/statis/MemberStatisticsMapper.xml index c20f185f..e854266c 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/statis/MemberStatisticsMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/statis/MemberStatisticsMapper.xml @@ -19,6 +19,7 @@ where del_flag = 0 and order_status = 1 + AND (order_type in (1,2) or (order_Type = 3 and ORDER_TYPE_EXTEND = 1)) and pay_time between #{param.startDate} and #{param.endDate} group by PK_REFERENCE ) r @@ -43,6 +44,7 @@ where del_flag = 0 and order_status = 1 + AND (order_type in (1,2) or (order_Type = 3 and ORDER_TYPE_EXTEND = 1)) and pay_time between #{param.startDate} and #{param.endDate} group by PK_REFERENCE ) r