角色充值排行榜查询修改

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/dto/RoleRechargeRankingDTO.java

@@ -118,15 +118,15 @@ public class RoleRechargeRankingDTO extends BasePage {
     private String phone;
 
     /**
-     * GS
+     * GS: 0-表示未操作
      */
-    @ApiModelProperty(value = "GS_ID")
+    @ApiModelProperty(value = "GS_ID:0-表示未操作")
     private Long gsId;
 
     /**
-     * 客服
+     * 客服:0-表示未操作
      */
-    @ApiModelProperty(value = "客服ID")
+    @ApiModelProperty(value = "客服ID:0-表示未操作")
     private Long customerServerId;
 
     /**
@@ -136,9 +136,9 @@ public class RoleRechargeRankingDTO extends BasePage {
     private Long pitcherId;
 
     /**
-     * 运营
+     * 运营:0-表示未操作
      */
-    @ApiModelProperty(value = "运营ID")
+    @ApiModelProperty(value = "运营ID:0-表示未操作")
     private Long operatorId;
 
     /**

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/service/impl/RoleManageServiceImpl.java

@@ -111,7 +111,12 @@ public class RoleManageServiceImpl implements IRoleManageService {
             criA.where().andEquals("user_phone", dto.getPhone());
         }
         if (dto.getGsId() != null) {
-            criA.where().andEquals("gs_id", dto.getGsId());
+            //GS
+            if (dto.getGsId() == 0L) {
+                criA.where().andIsNull("gs_id");
+            } else {
+                criA.where().andEquals("gs_id", dto.getGsId());
+            }
         }
         if (dto.getPitcherId() != null) {
             //投手
@@ -119,11 +124,19 @@ public class RoleManageServiceImpl implements IRoleManageService {
         }
         if (dto.getOperatorId() != null) {
             //运营
-            criA.where().andEquals("oper_user_id", dto.getOperatorId());
+            if (dto.getOperatorId() == 0L) {
+                criA.where().andIsNull("oper_user_id");
+            } else {
+                criA.where().andEquals("oper_user_id", dto.getOperatorId());
+            }
         }
         if (dto.getCustomerServerId() != null) {
             //客服
-            criA.where().andEquals("customer_service_id", dto.getCustomerServerId());
+            if (dto.getCustomerServerId() == 0L) {
+                criA.where().andIsNull("customer_service_id");
+            } else {
+                criA.where().andEquals("customer_service_id", dto.getCustomerServerId());
+            }
         }
         if (dto.getTotalRechargeMin() != null) {
             //累计充值金额最小值