Merge remote-tracking branch 'origin/package' into package

game-module/game-module-base/pom.xml

@@ -13,24 +13,20 @@
 
     <dependencies>
         <dependency>
-            <artifactId>game-module-mybatis</artifactId>
-            <groupId>com.zanxiang.game</groupId>
-            <version>${project.version}</version>
+            <groupId>org.apache.dubbo</groupId>
+            <artifactId>dubbo-spring-boot-starter</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.zanxiang.module</groupId>
-            <artifactId>zx-web</artifactId>
+            <groupId>org.apache.dubbo</groupId>
+            <artifactId>dubbo-metadata-definition-protobuf</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger2</artifactId>
-            <version>${swagger2.version}</version>
+            <groupId>com.zanxiang.module</groupId>
+            <artifactId>zx-web</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-            <version>${swagger2.ui.version}</version>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-core</artifactId>
         </dependency>
     </dependencies>
-
 </project>

game-module/game-module-base/src/main/java/com/zanxiang/game/module/base/pojo/dto/H5GameConfigDTO.java

@@ -1,7 +1,6 @@
 package com.zanxiang.game.module.base.pojo.dto;
 
 import com.zanxiang.game.module.base.pojo.enums.H5SignShowEnum;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -15,24 +14,20 @@ public class H5GameConfigDTO {
     /**
      * H5游戏地址
      */
-    @ApiModelProperty(notes = "H5游戏地址")
     private String h5GameUrl;
 
     /**
      * H5游戏登录窗Logo图片
      */
-    @ApiModelProperty(notes = "H5游戏登录窗Logo图片")
     private String h5LoginLogo;
 
     /**
      * H5侧边栏Logo图片
      */
-    @ApiModelProperty(notes = "H5侧边栏Logo图片")
     private String h5SignLogo;
 
     /**
      * H5侧边栏暂时类型枚举
      */
-    @ApiModelProperty(notes = "H5侧边栏暂时类型枚举")
     private H5SignShowEnum h5SignShow;
 }

game-module/game-module-manage/pom.xml

@@ -88,15 +88,6 @@
             <groupId>com.zanxiang.erp</groupId>
             <artifactId>erp-security</artifactId>
         </dependency>
-        <!-- dubbo -->
-        <dependency>
-            <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-spring-boot-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-metadata-definition-protobuf</artifactId>
-        </dependency>
         <!-- 腾讯广告服务 -->
         <dependency>
             <groupId>com.zanxiang.advertising.tencent</groupId>
@@ -109,6 +100,23 @@
             <artifactId>game-back-base</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <!-- 数据库表 -->
+        <dependency>
+            <artifactId>game-module-mybatis</artifactId>
+            <groupId>com.zanxiang.game</groupId>
+            <version>${project.version}</version>
+        </dependency>
+        <!-- swagger2 -->
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+            <version>${swagger2.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>${swagger2.ui.version}</version>
+        </dependency>
     </dependencies>
 
     <build>

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/ManageApplication.java

@@ -21,7 +21,7 @@ public class ManageApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(ManageApplication.class, args);
-        System.out.println("赞象Manage服务启动成功 <dubbo升级3.0, SDK后台组长权限修改> ( ´･･)ﾉ(._.`) \n" +
+        System.out.println("赞象Manage服务启动成功 <dubbo升级3.0, 依赖修改1> ( ´･･)ﾉ(._.`) \n" +
                 "___  ___  ___   _   _   ___  _____  _____ \n" +
                 "|  \\/  | / _ \\ | \\ | | / _ \\|  __ \\|  ___|\n" +
                 "| .  . |/ /_\\ \\|  \\| |/ /_\\ \\ |  \\/| |__  \n" +

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/OrderParam.java

@@ -32,19 +32,12 @@ public class OrderParam extends BaseListDTO<Order> {
     @ApiModelProperty(notes = "玩家账号")
     private String username;
 
+    @ApiModelProperty(notes = "所在服务器名称")
+    private String serverName;
+
     @ApiModelProperty(notes = "游戏角色")
     private String roleName;
 
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @ApiModelProperty(notes = "玩家注册时间-开始")
-    private LocalDate regTimeStart;
-
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @ApiModelProperty(notes = "玩家注册时间-结束")
-    private LocalDate regTimeEnd;
-
     @ApiModelProperty(notes = "cpId")
     private String cpId;
 
@@ -87,19 +80,33 @@ public class OrderParam extends BaseListDTO<Order> {
     @ApiModelProperty(notes = "广告上报状态")
     private Integer callBackStatus;
 
-    /**
-     * 开始时间
-     */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @ApiModelProperty(value = "开始时间")
+    @ApiModelProperty(value = "下单时间-开始")
     private LocalDate beginDate;
 
-    /**
-     * 结束时间
-     */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @ApiModelProperty(value = "结束时间")
+    @ApiModelProperty(value = "下单时间-结束")
     private LocalDate endDate;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty(notes = "玩家注册时间-开始")
+    private LocalDate regTimeStart;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty(notes = "玩家注册时间-结束")
+    private LocalDate regTimeEnd;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty(notes = "支付时间-开始")
+    private LocalDate payTimeStart;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty(notes = "支付时间-结束")
+    private LocalDate payTimeEnd;
 }

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/AgentServiceImpl.java

@@ -262,14 +262,14 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
         }
         //渠道id列表
         List<Long> agentIds = agentDTOList.stream().map(AgentDTO::getId).collect(Collectors.toList());
-        //管理员可见自然量数据
-        if (SecurityUtil.isManager() && Strings.isBlank(account) && Strings.isBlank(pitcherId) && agentId == null) {
-            agentIds.add(Agent.DEFAULT_AGENT);
-        }
-        //组长可见自然量
-        if (groupLeader && !agentIds.contains(Agent.DEFAULT_AGENT)) {
-            agentIds.add(Agent.DEFAULT_AGENT);
+        //未指定搜索条件
+        if (Strings.isBlank(account) && Strings.isBlank(pitcherId) && agentId == null) {
+            //管理员和组长可见自然量
+            if (SecurityUtil.isManager() || groupLeader) {
+                agentIds.add(Agent.DEFAULT_AGENT);
+            }
         }
+        //返回渠道列表
         return Tuples.of(agentIds, agentDTOList);
     }
 

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/OrderServiceImpl.java

@@ -199,9 +199,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                 .eq(Strings.isNotBlank(param.getMerchantOrderNo()), Order::getMerchantOrderNo, param.getMerchantOrderNo())
                 .eq(Strings.isNotBlank(param.getUserId()), Order::getUserId, param.getUserId())
                 .in(CollectionUtils.isNotEmpty(userIdList), Order::getUserId, userIdList)
-                .eq(Strings.isNotBlank(param.getRoleName()), Order::getRoleName, param.getRoleName())
-                .ge(param.getRegTimeStart() != null, Order::getRegTime, param.getRegTimeStart() == null ? null : LocalDateTime.of(param.getRegTimeStart(), LocalTime.MIN))
-                .le(param.getRegTimeEnd() != null, Order::getRegTime, param.getRegTimeEnd() == null ? null : LocalDateTime.of(param.getRegTimeEnd(), LocalTime.MAX))
+                .like(Strings.isNotBlank(param.getServerName()), Order::getServerName, param.getServerName())
+                .like(Strings.isNotBlank(param.getRoleName()), Order::getRoleName, param.getRoleName())
                 .eq(param.getCpId() != null, Order::getCpId, param.getCpId())
                 .eq(param.getGameId() != null, Order::getGameId, param.getGameId())
                 .in(CollectionUtils.isNotEmpty(agentIdList), Order::getAgentId, agentIdList)
@@ -216,6 +215,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                 .eq(param.getCallBackStatus() != null, Order::getCallBackStatus, param.getCallBackStatus())
                 .ge(param.getBeginDate() != null, Order::getCreateTime, param.getBeginDate() == null ? null : LocalDateTime.of(param.getBeginDate(), LocalTime.MIN))
                 .le(param.getEndDate() != null, Order::getCreateTime, param.getEndDate() == null ? null : LocalDateTime.of(param.getEndDate(), LocalTime.MAX))
+                .ge(param.getRegTimeStart() != null, Order::getRegTime, param.getRegTimeStart() == null ? null : LocalDateTime.of(param.getRegTimeStart(), LocalTime.MIN))
+                .le(param.getRegTimeEnd() != null, Order::getRegTime, param.getRegTimeEnd() == null ? null : LocalDateTime.of(param.getRegTimeEnd(), LocalTime.MAX))
+                .ge(param.getPayTimeStart() != null, Order::getPayTime, param.getPayTimeStart() == null ? null : LocalDateTime.of(param.getPayTimeStart(), LocalTime.MIN))
+                .le(param.getPayTimeEnd() != null, Order::getPayTime, param.getPayTimeEnd() == null ? null : LocalDateTime.of(param.getPayTimeEnd(), LocalTime.MAX))
                 .orderByDesc(Order::getCreateTime);
     }
 

game-module/game-module-sdk/pom.xml

@@ -104,21 +104,29 @@
             <artifactId>hutool-all</artifactId>
             <version>5.8.0.M1</version>
         </dependency>
-        <!-- dubbo -->
-        <dependency>
-            <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-spring-boot-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-metadata-definition-protobuf</artifactId>
-        </dependency>
         <!-- 广告回传 -->
         <dependency>
             <groupId>com.zanxiang.game</groupId>
             <artifactId>game-back-base</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <!-- 数据库表 -->
+        <dependency>
+            <artifactId>game-module-mybatis</artifactId>
+            <groupId>com.zanxiang.game</groupId>
+            <version>${project.version}</version>
+        </dependency>
+        <!-- swagger2 -->
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+            <version>${swagger2.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>${swagger2.ui.version}</version>
+        </dependency>
     </dependencies>
 
     <build>

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/SDKApplication.java

@@ -23,7 +23,7 @@ public class SDKApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(SDKApplication.class, args);
-        System.out.println("赞象SDK服务启动成功 <dubbo升级3.0, 兼容APP的渠道匹配> ( ´･･)ﾉ(._.`) \n" +
+        System.out.println("赞象SDK服务启动成功 <dubbo升级3.0, 依赖修改1> ( ´･･)ﾉ(._.`) \n" +
                 " ___________ _   __\n" +
                 "/  ___|  _  \\ | / /\n" +
                 "\\ `--.| | | | |/ / \n" +