浏览代码

修改内容:订单添加原始区服名搜索

lth 1 年之前
父节点
当前提交
61e94f20e3

+ 6 - 0
game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/dto/AdsOrderDetailListDTO.java

@@ -48,6 +48,12 @@ public class AdsOrderDetailListDTO extends BasePage {
     @ApiModelProperty(notes = "所在服务器名称")
     private String serverName;
 
+    /**
+     * 所在原始服务器名称
+     */
+    @ApiModelProperty(notes = "所在原始服务器名称")
+    private String sourceServerName;
+
     /**
      * 游戏角色
      */

+ 6 - 0
game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/dto/AdsOrderDetailTotalDTO.java

@@ -47,6 +47,12 @@ public class AdsOrderDetailTotalDTO {
     @ApiModelProperty(notes = "所在服务器名称")
     private String serverName;
 
+    /**
+     * 所在原始服务器名称
+     */
+    @ApiModelProperty(notes = "所在原始服务器名称")
+    private String sourceServerName;
+
     /**
      * 游戏角色
      */

+ 8 - 2
game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/service/impl/AdsOrderDetailService.java

@@ -70,7 +70,10 @@ public class AdsOrderDetailService implements IAdsOrderDetailService {
             cri.where().andEquals("username", dto.getUsername());
         }
         if (StringUtils.isNotBlank(dto.getServerName())) {
-            cri.where().andEquals("source_server_name", dto.getServerName());
+            cri.where().andEquals("server_name", dto.getServerName());
+        }
+        if (StringUtils.isNotBlank(dto.getSourceServerName())) {
+            cri.where().andEquals("source_server_name", dto.getSourceServerName());
         }
         if (gameIds != null) {
             cri.where().andInList("order_game_id", gameIds);
@@ -192,7 +195,10 @@ public class AdsOrderDetailService implements IAdsOrderDetailService {
             cri.where().andEquals("username", dto.getUsername());
         }
         if (StringUtils.isNotBlank(dto.getServerName())) {
-            cri.where().andEquals("source_server_name", dto.getServerName());
+            cri.where().andEquals("server_name", dto.getServerName());
+        }
+        if (StringUtils.isNotBlank(dto.getSourceServerName())) {
+            cri.where().andEquals("source_server_name", dto.getSourceServerName());
         }
         if (gameIds != null) {
             cri.where().andInList("order_game_id", gameIds);