fix : 游戏SDK下载

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服务启动成功001 ( ´･･)ﾉ(._.`) \n" +
+        System.out.println("赞象Manage服务启动成功002 ( ´･･)ﾉ(._.`) \n" +
                 "___  ___  ___   _   _   ___  _____  _____ \n" +
                 "|  \\/  | / _ \\ | \\ | | / _ \\|  __ \\|  ___|\n" +
                 "| .  . |/ /_\\ \\|  \\| |/ /_\\ \\ |  \\/| |__  \n" +

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/controller/MiPaySumController.java

@@ -12,17 +12,17 @@ import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+
 import java.math.BigDecimal;
 
 /**
- * @ClassName MiPaySumController
  * @Description 米大师支付统计
  * @Author tianhua
  * @Date 2023/6/27  11:10
  **/
 @Api(tags = "米大师支付管理")
 @RestController
-@RequestMapping("/pay/mipaysum")
+@RequestMapping("/miPay/sum")
 public class MiPaySumController {
 
     @Autowired
@@ -32,7 +32,7 @@ public class MiPaySumController {
     @PostMapping("/list")
     @PreAuthorize(permissionKey = "manage:miPaySum:list")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = MiPaySumListVO.class)})
-    public ResultVO<IPage<MiPaySumListVO>> list(@RequestBody MiPaySumListParam param){
+    public ResultVO<IPage<MiPaySumListVO>> list(@RequestBody MiPaySumListParam param) {
         return ResultVO.ok(miPaySumService.pageList(param));
     }
 
@@ -40,15 +40,15 @@ public class MiPaySumController {
     @PatchMapping("/status/update")
     @PreAuthorize(permissionKey = "manage:miPaySum:statusUpdate")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
-    public ResultVO<Boolean> statusUpdate(@RequestParam Long id, @RequestParam Integer status){
-        return ResultVO.ok(miPaySumService.statusUpdate(id,status));
+    public ResultVO<Boolean> statusUpdate(@RequestParam Long id, @RequestParam Integer status) {
+        return ResultVO.ok(miPaySumService.statusUpdate(id, status));
     }
 
     @ApiOperation(value = "米大师支付最大支付额度修改")
     @PatchMapping("/maxPayCount/update")
     @PreAuthorize(permissionKey = "manage:miPaySum:maxPayCountUpdate")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
-    public ResultVO<Boolean> maxPayCountUpdate(@RequestParam Long id, @RequestParam BigDecimal maxPayCount){
+    public ResultVO<Boolean> maxPayCountUpdate(@RequestParam Long id, @RequestParam BigDecimal maxPayCount) {
         return ResultVO.ok(miPaySumService.maxPayCountUpdate(id, maxPayCount));
     }
 

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/vo/MiPaySumListVO.java

@@ -29,65 +29,78 @@ public class MiPaySumListVO {
     /**
      * 游戏id
      */
+    @ApiModelProperty(notes = "游戏id")
     private Long gameId;
 
     /**
      * 游戏名称
      */
+    @ApiModelProperty(notes = "游戏名称")
     private String gameName;
 
     /**
      * 小游戏应用id
      */
+    @ApiModelProperty(notes = "小游戏应用id")
     private String appId;
 
     /**
      * 米大师应用id
      */
+    @ApiModelProperty(notes = "米大师应用id")
     private String miPayAppId;
 
     /**
      * 最大支付额度锁 0 正常 1 锁定
      */
+    @ApiModelProperty(notes = "最大支付额度锁 0 正常 1 锁定")
     private Integer maxPayLock;
 
     /**
      * 最大支付额度
      */
+    @ApiModelProperty(notes = "最大支付额度")
     private BigDecimal maxPayAmount;
 
     /**
      * 总支付金额
      */
+    @ApiModelProperty(notes = "总支付金额")
     private BigDecimal totalPayAmount;
 
     /**
      * 月已用支付额度
      */
+    @ApiModelProperty(notes = "月已用支付额度")
     private BigDecimal mouthPayAmount;
 
     /**
      * 周已用额度
      */
+    @ApiModelProperty(notes = "周已用额度")
     private BigDecimal weakerPayAmount;
 
     /**
      * 日已用额度
      */
+    @ApiModelProperty(notes = "日已用额度")
     private BigDecimal dayPayAmount;
 
     /**
      * 状态 1 不可用 0 正常
      */
+    @ApiModelProperty(notes = "状态 1 不可用 0 正常")
     private Integer status;
 
     /**
      * 创建时间
      */
+    @ApiModelProperty(notes = "创建时间")
     private LocalDateTime createTime;
 
     /**
      * 更新时间
      */
+    @ApiModelProperty(notes = "更新时间")
     private LocalDateTime updateTime;
 }

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

@@ -25,24 +25,28 @@ public interface IMiPaySumService extends IService<MiPaySum> {
     void add(Long gameId, String appId, String miPayAppId);
 
     /**
-     * 列表查询
+     * 页面列表
+     *
      * @param param 前端传递的查询参数实体
      * @return {@link IPage}<{@link MiPaySumListVO}>
      */
     IPage<MiPaySumListVO> pageList(MiPaySumListParam param);
 
     /**
-     * 状态变更
-     * @param id 主键id
+     * 状态更新
+     *
+     * @param id     主键id
      * @param status 状态
-     * @return {@link Boolean}
+     * @return boolean
      */
     boolean statusUpdate(Long id, Integer status);
 
     /**
      * 米大师最大支付额度修改
-     * @param maxPayCount
-     * @return {@link Boolean}
+     *
+     * @param id          id
+     * @param maxPayCount 马克斯支付数
+     * @return boolean
      */
     boolean maxPayCountUpdate(Long id, BigDecimal maxPayCount);
 }

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

@@ -63,10 +63,10 @@ public class MiPaySumServiceImpl extends ServiceImpl<MiPaySumMapper, MiPaySum> i
                 .eq(param.getGameId() != null, MiPaySum::getGameId, param.getGameId())
                 .eq(param.getStatus() != null, MiPaySum::getStatus, param.getStatus())
                 .orderByDesc(MiPaySum::getCreateTime)
-        ).convert(miPaySum -> this.toVo(miPaySum));
+        ).convert(this::toVO);
     }
 
-    private MiPaySumListVO toVo(MiPaySum miPaySum) {
+    private MiPaySumListVO toVO(MiPaySum miPaySum) {
         MiPaySumListVO miPaySumListVO = BeanUtil.copy(miPaySum, MiPaySumListVO.class);
         if (miPaySumListVO == null) {
             return null;
@@ -88,8 +88,9 @@ public class MiPaySumServiceImpl extends ServiceImpl<MiPaySumMapper, MiPaySum> i
         }
         //获取游戏名字
         GameDTO gameDTO = gameService.getById(miPaySumListVO.getGameId());
-        miPaySumListVO.setGameName(gameDTO.getName());
-
+        if (gameDTO != null) {
+            miPaySumListVO.setGameName(gameDTO.getName());
+        }
         return miPaySumListVO;
     }
 

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服务启动成功001 ( ´･･)ﾉ(._.`) \n" +
+        System.out.println("赞象SDK服务启动成功002 ( ´･･)ﾉ(._.`) \n" +
                 " ___________ _   __\n" +
                 "/  ___|  _  \\ | / /\n" +
                 "\\ `--.| | | | |/ / \n" +

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/constant/RedisKeyConstant.java

@@ -12,11 +12,6 @@ public class RedisKeyConstant {
      */
     private static final String REDIS_PREFIX = "game_sdk_";
 
-    /**
-     * 游戏密钥缓存
-     */
-    public static final String GAME_SECRET_KEY = RedisKeyConstant.REDIS_PREFIX + "game_secret_key";
-
     /**
      * 用户token缓存key
      */

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/constant/RegexConstant.java

@@ -52,11 +52,6 @@ public class RegexConstant {
      */
     public static final String REGEX_ZH = "^[\\u4e00-\\u9fa5]+$";
 
-    /**
-     * 正则：QQ号
-     */
-    public static final String REGEX_TENCENT_NUM = "[1-9][0-9]{4,}";
-
     /**
      * 正则：中国邮政编码
      */

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/impl/PerformOrderServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.zanxiang.game.module.base.pojo.enums.CpStatusEnum;
+import com.zanxiang.game.module.base.util.DateUtils;
 import com.zanxiang.game.module.mybatis.entity.*;
 import com.zanxiang.game.module.sdk.enums.OrderStateEnum;
 import com.zanxiang.game.module.sdk.pojo.dto.GameAppletDTO;
@@ -11,7 +12,6 @@ import com.zanxiang.game.module.sdk.pojo.dto.PayMerchantDTO;
 import com.zanxiang.game.module.sdk.pojo.dto.PlatformOrderDTO;
 import com.zanxiang.game.module.sdk.pojo.result.PushCpResult;
 import com.zanxiang.game.module.sdk.service.*;
-import com.zanxiang.game.module.sdk.util.DateUtils;
 import com.zanxiang.game.module.sdk.util.SignUtil;
 import com.zanxiang.module.util.JsonUtil;
 import com.zanxiang.module.util.URIUtil;

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/service/impl/UserTokenServiceImpl.java

@@ -3,6 +3,7 @@ package com.zanxiang.game.module.sdk.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zanxiang.game.module.base.pojo.enums.BanStatusEnum;
+import com.zanxiang.game.module.base.util.DateUtils;
 import com.zanxiang.game.module.mybatis.entity.GameExt;
 import com.zanxiang.game.module.mybatis.entity.User;
 import com.zanxiang.game.module.mybatis.entity.UserToken;
@@ -16,7 +17,6 @@ import com.zanxiang.game.module.sdk.service.IGameExtService;
 import com.zanxiang.game.module.sdk.service.IIpBanService;
 import com.zanxiang.game.module.sdk.service.IUserService;
 import com.zanxiang.game.module.sdk.service.IUserTokenService;
-import com.zanxiang.game.module.sdk.util.DateUtils;
 import com.zanxiang.game.module.sdk.util.RedisUtil;
 import com.zanxiang.game.module.sdk.util.SignUtil;
 import com.zanxiang.module.util.bean.BeanUtil;

game-module/game-module-sdk/src/main/java/com/zanxiang/game/module/sdk/util/DateUtils.java

@@ -1,56 +0,0 @@
-package com.zanxiang.game.module.sdk.util;
-
-import com.zanxiang.module.util.DateUtil;
-
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.temporal.TemporalAdjusters;
-
-/**
- * 时间工具类
- *
- * @author ruoyi
- */
-public class DateUtils extends DateUtil {
-
-    /**
-     * 验证当前时间是否为当天
-     *
-     * @param time 时间
-     * @return boolean
-     */
-    public static boolean isToday(LocalDateTime time) {
-        LocalDateTime startTime = LocalDateTime.now().with(LocalTime.MIN);
-        LocalDateTime endTime = LocalDateTime.now().with(LocalTime.MAX);
-        //如果大于今天的开始日期，小于今天的结束日期
-        return time.isAfter(startTime) && time.isBefore(endTime);
-    }
-
-    /**
-     * 验证当前时间是否为当月
-     *
-     * @param time 时间
-     * @return boolean
-     */
-    public static boolean isThisMonth(LocalDateTime time) {
-        LocalDate localDate = time.toLocalDate();
-        LocalDate now = LocalDate.now();
-        return localDate.isAfter(now.minusMonths(1).with(TemporalAdjusters.lastDayOfMonth())) &&
-                localDate.isBefore(now.plusMonths(1).with(TemporalAdjusters.firstDayOfMonth()));
-    }
-
-    /**
-     * 验证当前时间是否为本周
-     *
-     * @param time 时间
-     * @return boolean
-     */
-    public static boolean isThisWeek(LocalDateTime time) {
-        LocalDateTime now = LocalDateTime.now();
-        int dayOfWeek = now.getDayOfWeek().getValue();
-        LocalDateTime weekStart = now.minusDays(dayOfWeek - 1).with(LocalTime.MIN);
-        LocalDateTime weekEnd = now.plusDays(7 - dayOfWeek).with(LocalTime.MAX);
-        return time.isAfter(weekStart) && time.isBefore(weekEnd);
-    }
-}