zoujiajian 9 달 전
부모
커밋
4b8c075969

+ 1 - 1
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("goodsId") Long goodsId, @Param("start") String start, @Param("end") String end);
+	List<GptRechargeStatisticsRecordResp> selectRechargeRecordNum(@Param("goodsIds") List<Long> goodsIds, @Param("start") String start, @Param("end") String end);
 }

+ 5 - 2
netflix-dao/src/main/resources/mapper/GroupRelationMapper.xml

@@ -486,8 +486,11 @@
         where gur.num &lt; 0
         and gur.operator != ''
         and gur.created_time between #{start} and #{end}
-        <if test="goodsId != null">
-            and sku.goods_id = #{goodsId}
+        <if test="goodsIds != null">
+            and sku.goods_id in
+            <foreach collection="goodsIds" item="item" open="(" separator="," close=")">
+                #{item}
+          </foreach>
         </if>
         group by gur.operator
         order by num desc

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

@@ -398,7 +398,7 @@ public class CmsGroupRelationController {
      * 统计 代充操作数据
      */
     @GetMapping("/get/recharge/operate/statistics/data")
-    public Result<List<GptRechargeStatisticsRecordResp>> getRechargeStatisticsData(Long goodsId, String startTime, String endTime) {
+    public Result<List<GptRechargeStatisticsRecordResp>> getRechargeStatisticsData(@RequestParam(name = "goodsIds", required = false) List<Long> goodsIds, String startTime, String endTime) {
         if (StrUtil.isEmpty(startTime)) {
             startTime = DateUtil.beginOfMonth(DateTime.now()).toString();
             endTime = DateUtil.endOfMonth(DateTime.now()).toString();
@@ -408,7 +408,7 @@ public class CmsGroupRelationController {
                 .field(CmsUserVO::getStatus, Boolean.TRUE)
                 .build());
         List<String> showUsers = customers.stream().map(CmsUserVO::getNickname).collect(Collectors.toList());
-        List<GptRechargeStatisticsRecordResp> recordResps = groupsRelationMapper.selectRechargeRecordNum(goodsId, startTime, endTime);
+        List<GptRechargeStatisticsRecordResp> recordResps = groupsRelationMapper.selectRechargeRecordNum(goodsIds, startTime, endTime);
         //过滤
         recordResps = recordResps.stream().filter(rsp -> showUsers.contains(rsp.getOperator())).collect(Collectors.toList());
         return GatewayResponse.SUCCESS.newBuilder().toResult(recordResps);