fix 统计代充操作数据操作人员筛选

netflix-dao/src/main/java/com/cyksj/mapper/GroupsRelationMapper.java

@@ -89,5 +89,5 @@ public interface GroupsRelationMapper extends BaseMapper<GroupsRelation> {
 
 	Integer updateUserVipSkusExpiryTime(@Param("userIds") List<Long> userIds, @Param("vipSkuIds") List<Long> vipSkuIds, @Param("expiryTime") Date expiryTime);
 
-	List<GptRechargeStatisticsRecordResp> selectRechargeRecordNum(@Param("goodsIds") List<Long> goodsIds, @Param("start") String start, @Param("end") String end);
+	List<GptRechargeStatisticsRecordResp> selectRechargeRecordNum(@Param("goodsIds") List<Long> goodsIds, @Param("start") String start, @Param("end") String end, @Param("operator") String operator);
 }

netflix-dao/src/main/resources/mapper/GroupRelationMapper.xml

@@ -488,7 +488,10 @@
             and o.goods_id in
             <foreach collection="goodsIds" item="item" open="(" separator="," close=")">
                 #{item}
-          </foreach>
+            </foreach>
+        </if>
+        <if test="operator != null">
+            and gur.operator = #{operator}
         </if>
         group by gur.operator
         order by num desc

netflix-web/src/main/java/com/cyksj/web/controller/manage/group/CmsGroupRelationController.java

@@ -399,19 +399,22 @@ public class CmsGroupRelationController {
      * 统计 代充操作数据
      */
     @GetMapping("/get/recharge/operate/statistics/data")
-    public Result<List<GptRechargeStatisticsRecordResp>> getRechargeStatisticsData(@RequestParam(name = "goodsIds", required = false) List<Long> goodsIds, String startTime, String endTime) {
+    public Result<List<GptRechargeStatisticsRecordResp>> getRechargeStatisticsData(@RequestParam(name = "goodsIds", required = false) List<Long> goodsIds, String startTime, String endTime, String operator) {
         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(goodsIds, startTime, endTime);
-        //过滤
-        recordResps = recordResps.stream().filter(rsp -> showUsers.contains(rsp.getOperator())).collect(Collectors.toList());
+
+        List<GptRechargeStatisticsRecordResp> recordResps = groupsRelationMapper.selectRechargeRecordNum(goodsIds, startTime, endTime, operator);
+        if (StrUtil.isEmpty(operator)) {
+            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());
+            //过滤
+            recordResps = recordResps.stream().filter(rsp -> showUsers.contains(rsp.getOperator())).collect(Collectors.toList());
+        }
         return GatewayResponse.SUCCESS.newBuilder().toResult(recordResps);
     }