angelo
/
java-base-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: angelo:d00c3bc3276ef2fa306a2a06ea26b3d3d4d149b1
Branches Tags
angelo:master
angelo:bd_test
angelo:bd_dev
angelo:lx-dp_online
angelo:lx_online
angelo:bd_online
angelo:lx_test
angelo:lx_dev
angelo:lx-mh_online
angelo:bd_dev_image
angelo:bd_dev_20250910
..
compare: angelo:0dbe162d7f7140b40acb46a991bc0bc8a9fdc134
Branches Tags
angelo:bd_test
angelo:bd_dev
angelo:lx-dp_online
angelo:lx_online
angelo:bd_online
angelo:lx_test
angelo:lx_dev
angelo:lx-mh_online
angelo:bd_dev_image
angelo:bd_dev_20250910
angelo:master

No commits in common. "d00c3bc3276ef2fa306a2a06ea26b3d3d4d149b1" and "0dbe162d7f7140b40acb46a991bc0bc8a9fdc134" have entirely different histories.
d00c3bc327 ... 0dbe162d7f

3 changed files with 2 additions and 18 deletions
Show Stats Expand all files Collapse all files

12
bd-business/bd-business-member/src/main/java/com/hzs/member/statis/controller/manager/BackMemberStatisticsController.java
View File

@ -38,18 +38,6 @@ public class BackMemberStatisticsController {
redisService.setCacheObject(CacheConstants.TOP_30_ACTIVITY + ETop30Type.AMOUNT.getKey(), flag); redisService.setCacheObject(CacheConstants.TOP_30_ACTIVITY + ETop30Type.AMOUNT.getKey(), flag);
return AjaxResult.success(); 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") @PostMapping("/topPeople")
public AjaxResult topPeople(@RequestBody DirectStatisticsTop30QueryParam param) { public AjaxResult topPeople(@RequestBody DirectStatisticsTop30QueryParam param) {
param.setFaker(false); param.setFaker(false);

6
bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/MemberStatisticsServiceImpl.java
View File

@ -72,10 +72,8 @@ public class MemberStatisticsServiceImpl implements IMemberStatisticsService {
result = generateFakeData(list, 30, fakerList, type); result = generateFakeData(list, 30, fakerList, type);
} }
for (DirectStatisticsTop30VO directStatisticsTop30VO : result) { for (DirectStatisticsTop30VO directStatisticsTop30VO : result) {
if(param.getFaker()){ directStatisticsTop30VO.setMemberCode(DataMaskingUtil.mask(directStatisticsTop30VO.getMemberCode(), 2, 2));
directStatisticsTop30VO.setMemberCode(DataMaskingUtil.mask(directStatisticsTop30VO.getMemberCode(), 2, 2)); directStatisticsTop30VO.setMemberName(DataMaskingUtil.mask(directStatisticsTop30VO.getMemberName(), 1, 0));
directStatisticsTop30VO.setMemberName(DataMaskingUtil.mask(directStatisticsTop30VO.getMemberName(), 1, 0));
}
directStatisticsTop30VO.setNumberOfAmount(directStatisticsTop30VO.getNumberOfAmount().divide(new BigDecimal(10000))); directStatisticsTop30VO.setNumberOfAmount(directStatisticsTop30VO.getNumberOfAmount().divide(new BigDecimal(10000)));
} }
return result; return result;

2
bd-business/bd-business-member/src/main/resources/mapper/member/statis/MemberStatisticsMapper.xml
View File

@ -19,7 +19,6 @@
where where
del_flag = 0 del_flag = 0
and order_status = 1 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} and pay_time between #{param.startDate} and #{param.endDate}
group by PK_REFERENCE group by PK_REFERENCE
) r ) r
@ -44,7 +43,6 @@
where where
del_flag = 0 del_flag = 0
and order_status = 1 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} and pay_time between #{param.startDate} and #{param.endDate}
group by PK_REFERENCE group by PK_REFERENCE
) r ) r