|
|
@@ -398,17 +398,17 @@ public class CmsGroupRelationController {
|
|
|
* 统计 代充操作数据
|
|
|
*/
|
|
|
@GetMapping("/get/recharge/operate/statistics/data")
|
|
|
- public Result<List<GptRechargeStatisticsRecordResp>> getRechargeStatisticsData(Long goodsId, String start, String end) {
|
|
|
- if (StrUtil.isEmpty(start)) {
|
|
|
- start = DateUtil.beginOfMonth(DateTime.now()).toString();
|
|
|
- end = DateUtil.endOfMonth(DateTime.now()).toString();
|
|
|
+ public Result<List<GptRechargeStatisticsRecordResp>> getRechargeStatisticsData(Long goodsId, String startTime, String endTime) {
|
|
|
+ if (StrUtil.isEmpty(startTime)) {
|
|
|
+ startTime = DateUtil.beginOfMonth(DateTime.now()).toString();
|
|
|
+ endTime = DateUtil.endOfMonth(DateTime.now()).toString();
|
|
|
}
|
|
|
List<CmsUserVO> customers = beanSearcher.searchAll(CmsUserVO.class, MapUtils.builder()
|
|
|
.field(CmsUserVO::getRoleNames, List.of("客服", "root")).op(Operator.InList)
|
|
|
.field(CmsUserVO::getStatus, Boolean.TRUE)
|
|
|
.build());
|
|
|
List<String> showUsers = customers.stream().map(CmsUserVO::getNickname).collect(Collectors.toList());
|
|
|
- List<GptRechargeStatisticsRecordResp> recordResps = groupsRelationMapper.selectRechargeRecordNum(goodsId, start, end);
|
|
|
+ List<GptRechargeStatisticsRecordResp> recordResps = groupsRelationMapper.selectRechargeRecordNum(goodsId, startTime, endTime);
|
|
|
//过滤
|
|
|
recordResps = recordResps.stream().filter(rsp -> showUsers.contains(rsp.getOperator())).collect(Collectors.toList());
|
|
|
return GatewayResponse.SUCCESS.newBuilder().toResult(recordResps);
|