feat : 玩家模块接口代码提交

game-module/game-common/src/main/java/com/zanxiang/common/enums/PayDeviceEnum.java

@@ -1,6 +1,5 @@
 package com.zanxiang.common.enums;
 
-import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 import java.util.ArrayList;

game-module/game-sdk/src/main/java/com/zanxiang/sdk/common/util/MD5Util.java → game-module/game-common/src/main/java/com/zanxiang/common/utils/MD5Util.java

@@ -1,6 +1,4 @@
-package com.zanxiang.sdk.common.util;
-
-import com.zanxiang.common.utils.StringUtils;
+package com.zanxiang.common.utils;
 
 import java.security.MessageDigest;
 

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

@@ -2,11 +2,8 @@ package com.zanxiang.manage.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zanxiang.common.domain.ResultVo;
-import com.zanxiang.manage.domain.params.GamePayWayListParam;
-import com.zanxiang.manage.domain.params.GamePayWayParam;
 import com.zanxiang.manage.domain.params.GameStrategyListParam;
 import com.zanxiang.manage.domain.params.GameStrategyParam;
-import com.zanxiang.manage.domain.vo.GamePayWayListVO;
 import com.zanxiang.manage.domain.vo.GameStrategyListVO;
 import com.zanxiang.manage.service.GameStrategyService;
 import io.swagger.annotations.Api;

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

@@ -2,9 +2,7 @@ package com.zanxiang.manage.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zanxiang.common.domain.ResultVo;
-import com.zanxiang.manage.domain.params.GameStrategyListParam;
 import com.zanxiang.manage.domain.params.LogPayCpParam;
-import com.zanxiang.manage.domain.vo.GameStrategyListVO;
 import com.zanxiang.manage.domain.vo.LogPayCpVO;
 import com.zanxiang.manage.service.LogPayCpService;
 import io.swagger.annotations.Api;

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

@@ -6,10 +6,7 @@ import com.zanxiang.common.enums.AuthPlatform;
 import com.zanxiang.common.enums.OsEnum;
 import com.zanxiang.common.enums.VipLevelEnum;
 import com.zanxiang.common.utils.bean.BeanUtils;
-import com.zanxiang.manage.domain.params.GameUserListParam;
-import com.zanxiang.manage.domain.params.GameUserRoleListParam;
-import com.zanxiang.manage.domain.params.UserLoginLogParam;
-import com.zanxiang.manage.domain.params.UserNameAuthListParam;
+import com.zanxiang.manage.domain.params.*;
 import com.zanxiang.manage.domain.vo.*;
 import com.zanxiang.manage.service.*;
 import io.swagger.annotations.Api;
@@ -53,6 +50,9 @@ public class UserController {
     @Autowired
     private UserLoginLogService userLoginLogService;
 
+    @Autowired
+    private OrderService orderService;
+
 //    @ApiOperation(value = "玩家列表")
 //    @PostMapping(value = "/list")
 //    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = IpBanVO.class)})
@@ -60,12 +60,12 @@ public class UserController {
 //        return null;
 //    }
 
-//    @ApiOperation(value = "玩家详细信息")
-//    @PostMapping(value = "/update")
-//    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = IpBanVO.class)})
-//    public ResultVo<IPage<IpBanVO>> update(@Validated @RequestBody IpBanListParam param) {
-//        return null;
-//    }
+    @ApiOperation(value = "玩家信息编辑")
+    @PostMapping(value = "/update")
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Boolean.class)})
+    public ResultVo<Boolean> userUpdate(@Validated @RequestBody UserUpdateParam param) {
+        return ResultVo.ok(userService.userUpdate(param));
+    }
 
     @ApiOperation(value = "玩家详细信息")
     @GetMapping(value = "/info")
@@ -89,10 +89,10 @@ public class UserController {
     }
 
     @ApiOperation(value = "玩家下单记录列表")
-    @GetMapping(value = "/order/list")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = UserAddressVO.class)})
-    public ResultVo<List<UserAddressVO>> orderList(@RequestParam Long userId) {
-        return ResultVo.ok();
+    @PostMapping(value = "/order/list")
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = UserOrderListVO.class)})
+    public ResultVo<IPage<UserOrderListVO>> orderList(@Validated @RequestBody UserOrderListParam param) {
+        return ResultVo.ok(orderService.orderList(param));
     }
 
     @ApiOperation(value = "玩家收货地址列表")

game-module/game-manage/src/main/java/com/zanxiang/manage/domain/params/GameStrategyOrderParam.java

@@ -1,7 +1,6 @@
 package com.zanxiang.manage.domain.params;
 
 import com.zanxiang.common.domain.gameStrategy.Order;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;

game-module/game-manage/src/main/java/com/zanxiang/manage/domain/params/OrderCompleteParam.java

@@ -10,7 +10,6 @@ import org.springframework.format.annotation.DateTimeFormat;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**

game-module/game-manage/src/main/java/com/zanxiang/manage/domain/params/UserOrderListParam.java

@@ -0,0 +1,26 @@
+package com.zanxiang.manage.domain.params;
+
+import com.zanxiang.common.base.BasePage;
+import com.zanxiang.mybatis.entity.Order;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author : lingfeng
+ * @time : 2022-07-05
+ * @description : 下单记录
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class UserOrderListParam extends BasePage<Order> {
+
+    /**
+     * 用户id
+     */
+    @NotNull(message = "用户id不可为空")
+    @ApiModelProperty(notes = "用户id")
+    private Long userId;
+}

game-module/game-manage/src/main/java/com/zanxiang/manage/domain/params/UserUpdateParam.java

@@ -0,0 +1,60 @@
+package com.zanxiang.manage.domain.params;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author : lingfeng
+ * @time : 2022-07-05
+ * @description : 用户信息更新参数
+ */
+@Data
+public class UserUpdateParam {
+
+    /**
+     * 用户id
+     */
+    @NotNull(message = "玩家id不可为空")
+    @ApiModelProperty(notes = "玩家id")
+    private Long userId;
+
+    /**
+     * 用户名
+     */
+    @NotBlank(message = "玩家账号")
+    @ApiModelProperty(notes = "玩家账号")
+    private String username;
+
+    /**
+     * 真实姓名
+     */
+    @ApiModelProperty(notes = "真实姓名")
+    private String realName;
+
+    /**
+     * 证件号码
+     */
+    @ApiModelProperty(notes = "证件号码")
+    private String idCard;
+
+    /**
+     * 绑定手机号码
+     */
+    @ApiModelProperty(notes = "绑定手机号码")
+    private String mobile;
+
+    /**
+     * 绑定支付宝账号
+     */
+    @ApiModelProperty(notes = "绑定支付宝账号")
+    private String aliPay;
+
+    /**
+     * 密码
+     */
+    @ApiModelProperty(notes = "密码")
+    private String password;
+}

game-module/game-manage/src/main/java/com/zanxiang/manage/domain/vo/GamePayWayListVO.java

@@ -1,6 +1,5 @@
 package com.zanxiang.manage.domain.vo;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.StringSerializer;
 import io.swagger.annotations.ApiModelProperty;

game-module/game-manage/src/main/java/com/zanxiang/manage/domain/vo/UserOrderListVO.java

@@ -1,9 +1,73 @@
 package com.zanxiang.manage.domain.vo;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
 /**
  * @author : lingfeng
  * @time : 2022-07-05
  * @description : 下单记录
  */
+@Data
+@ApiModel
 public class UserOrderListVO {
+
+    /**
+     * 用户id
+     */
+    @ApiModelProperty(notes = "用户id")
+    private String userId;
+
+    /**
+     * 商户订单号
+     */
+    @ApiModelProperty(notes = "商户订单号")
+    private String id;
+
+    /**
+     * 游戏商品名称
+     */
+    @ApiModelProperty(notes = "游戏商品名称")
+    private String productName;
+
+    /**
+     * 货物总价
+     */
+    @ApiModelProperty(notes = "货物总价")
+    private BigDecimal amount;
+
+    /**
+     * 支付状态，1待支付，2 支付成功，-1 已取消
+     */
+    @ApiModelProperty(notes = "支付状态，1待支付，2 支付成功，-1 已取消")
+    private Integer status;
+
+    /**
+     * 游戏名称
+     */
+    @ApiModelProperty(notes = "游戏名称")
+    private String gameName;
+
+    /**
+     * 游戏应用类型
+     */
+    @ApiModelProperty(notes = "游戏应用类型")
+    private String gameCategoryName;
+
+    /**
+     * 充值游戏角色名称
+     */
+    @ApiModelProperty(notes = "充值游戏角色名称")
+    private String roleName;
+
+    /**
+     * 订单时间
+     */
+    @ApiModelProperty(notes = "订单时间")
+    private LocalDateTime createTime;
+
 }

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

@@ -1,15 +1,11 @@
 package com.zanxiang.manage.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.zanxiang.manage.domain.bo.PayMerchantBO;
-import com.zanxiang.manage.domain.params.GamePayWayListParam;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.zanxiang.manage.domain.params.GameStrategyListParam;
 import com.zanxiang.manage.domain.params.GameStrategyParam;
-import com.zanxiang.manage.domain.params.PayMerchantListParam;
 import com.zanxiang.manage.domain.vo.GameStrategyListVO;
-import com.zanxiang.manage.domain.vo.PayMerchantListVO;
 import com.zanxiang.mybatis.entity.GameStrategy;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * 游戏策略 服务类接口

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

@@ -4,28 +4,28 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zanxiang.common.enums.DeleteEnum;
 import com.zanxiang.common.exception.ParamNullException;
 import com.zanxiang.common.utils.JsonUtil;
 import com.zanxiang.common.utils.StringUtils;
 import com.zanxiang.common.utils.bean.BeanUtils;
-import com.zanxiang.manage.domain.bo.PayMerchantBO;
 import com.zanxiang.manage.domain.mapper.GameStrategyListMapper;
-import com.zanxiang.manage.domain.params.GamePayWayListParam;
 import com.zanxiang.manage.domain.params.GameStrategyListParam;
 import com.zanxiang.manage.domain.params.GameStrategyParam;
-import com.zanxiang.manage.domain.params.PayMerchantListParam;
 import com.zanxiang.manage.domain.vo.GameStrategyListVO;
-import com.zanxiang.manage.domain.vo.PayApplicationVO;
-import com.zanxiang.manage.domain.vo.PayMerchantListVO;
 import com.zanxiang.manage.service.*;
-import com.zanxiang.mybatis.entity.*;
+import com.zanxiang.mybatis.entity.GamePayWay;
+import com.zanxiang.mybatis.entity.GameStrategy;
+import com.zanxiang.mybatis.entity.PayMerchant;
 import com.zanxiang.mybatis.mapper.GameStrategyMapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**

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

@@ -0,0 +1,84 @@
+package com.zanxiang.manage.service.Impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zanxiang.common.utils.bean.BeanUtils;
+import com.zanxiang.manage.domain.dto.GameDTO;
+import com.zanxiang.manage.domain.dto.GameUserRoleDTO;
+import com.zanxiang.manage.domain.params.UserOrderListParam;
+import com.zanxiang.manage.domain.vo.GameCategoryVO;
+import com.zanxiang.manage.domain.vo.UserOrderListVO;
+import com.zanxiang.manage.service.GameCategoryService;
+import com.zanxiang.manage.service.GameService;
+import com.zanxiang.manage.service.GameUserRoleService;
+import com.zanxiang.manage.service.OrderService;
+import com.zanxiang.mybatis.entity.Order;
+import com.zanxiang.mybatis.mapper.OrderMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author : lingfeng
+ * @time : 2022-07-05
+ * @description : 用户订单
+ */
+@Slf4j
+@Service
+public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements OrderService {
+
+    @Autowired
+    private GameUserRoleService gameUserRoleService;
+
+    @Autowired
+    private GameService gameService;
+
+    @Autowired
+    private GameCategoryService gameCategoryService;
+
+    /**
+     * 获取用户下单记录
+     *
+     * @param param : 参数
+     * @return : 返回单页数据
+     */
+    @Override
+    public IPage<UserOrderListVO> orderList(UserOrderListParam param) {
+        //执行查询
+        return page(param.toPage(), new QueryWrapper<Order>().lambda()
+                .eq(Order::getUserId, param.getUserId())
+                .orderByDesc(Order::getCreateTime)
+        ).convert(this::toVo);
+    }
+
+    /**
+     * 订单信息对象转换
+     *
+     * @param order : 订单信息
+     * @return : 订单信息展示对象
+     */
+    private UserOrderListVO toVo(Order order) {
+        if (order == null) {
+            return null;
+        }
+        UserOrderListVO orderListVO = BeanUtils.copy(order, UserOrderListVO.class);
+        //查询角色名称
+        GameUserRoleDTO gameUserRoleDTO = gameUserRoleService.getByRoleId(order.getRoleId());
+        if (gameUserRoleDTO != null) {
+            orderListVO.setRoleName(gameUserRoleDTO.getRoleName());
+        }
+        //设置游戏名称
+        GameDTO gameDTO = gameService.getById(order.getGameId());
+        if (gameDTO == null) {
+            return orderListVO;
+        }
+        //设置游戏列表
+        GameCategoryVO gameCategoryVO = gameCategoryService.getById(gameDTO.getCategory());
+        if (gameCategoryVO != null) {
+            orderListVO.setGameCategoryName(gameCategoryVO.getName());
+        }
+        orderListVO.setGameName(gameDTO.getName());
+        return orderListVO;
+    }
+}

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

@@ -1,24 +1,30 @@
 package com.zanxiang.manage.service.Impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zanxiang.common.exception.BaseException;
+import com.zanxiang.common.utils.MD5Util;
 import com.zanxiang.common.utils.bean.BeanUtils;
 import com.zanxiang.manage.domain.dto.ChannelDTO;
 import com.zanxiang.manage.domain.dto.GameDTO;
 import com.zanxiang.manage.domain.dto.UserDTO;
 import com.zanxiang.manage.domain.dto.UserExtDTO;
+import com.zanxiang.manage.domain.params.UserUpdateParam;
 import com.zanxiang.manage.domain.vo.GameUserVO;
 import com.zanxiang.manage.domain.vo.UserVO;
 import com.zanxiang.manage.service.*;
 import com.zanxiang.mybatis.entity.User;
+import com.zanxiang.mybatis.entity.UserExt;
 import com.zanxiang.mybatis.mapper.UserMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.logging.log4j.util.Strings;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDateTime;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -46,6 +52,46 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     @Autowired
     private GameUserService gameUserService;
 
+    /**
+     * 用户信息更新
+     *
+     * @param param : 用户更新参数
+     * @return : 返回更新结果
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean userUpdate(UserUpdateParam param) {
+        //用户信息更新
+        super.update(new LambdaUpdateWrapper<User>()
+                .eq(User::getId, param.getUserId())
+                .eq(User::getUsername, param.getUsername())
+                .set(Strings.isNotBlank(param.getMobile()), User::getMobile, param.getMobile())
+                .set(Strings.isNotBlank(param.getAliPay()), User::getAliPay, param.getAliPay())
+                .set(Strings.isNotBlank(param.getPassword()), User::getPassword, this.cmfPassword(param.getPassword()))
+                .set(Strings.isNotBlank(param.getMobile()) || Strings.isNotBlank(param.getAliPay())
+                        || Strings.isNotBlank(param.getPassword()), User::getUpdateTime, LocalDateTime.now()));
+        //用户拓展信息更新
+        userExtService.update(new LambdaUpdateWrapper<UserExt>()
+                .eq(UserExt::getUserId, param.getUserId())
+                .set(Strings.isNotBlank(param.getRealName()), UserExt::getRealName, param.getRealName())
+                .set(Strings.isNotBlank(param.getIdCard()), UserExt::getIdCard, param.getIdCard())
+                .set(Strings.isNotBlank(param.getRealName()) || Strings.isNotBlank(param.getIdCard()), UserExt::getUpdateTime, LocalDateTime.now())
+        );
+        return Boolean.TRUE;
+    }
+
+    /**
+     * 密码cfm加密
+     *
+     * @param password : 密码
+     * @return : 返回加密完的密码
+     */
+    private String cmfPassword(String password) {
+        String passwordSalt = password + "ZX_PASSWORD_SALT";
+        String charsetName = "UTF-8";
+        return "###" + MD5Util.MD5Encode(MD5Util.MD5Encode(passwordSalt, charsetName), charsetName);
+    }
+
     /**
      * 查询玩家详细信息
      *

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

@@ -0,0 +1,23 @@
+package com.zanxiang.manage.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zanxiang.manage.domain.params.UserOrderListParam;
+import com.zanxiang.manage.domain.vo.UserOrderListVO;
+import com.zanxiang.mybatis.entity.Order;
+
+/**
+ * @author : lingfeng
+ * @time : 2022-07-05
+ * @description : 用户订单
+ */
+public interface OrderService extends IService<Order> {
+
+    /**
+     * 获取用户下单记录
+     *
+     * @param param : 参数
+     * @return : 返回单页数据
+     */
+    IPage<UserOrderListVO> orderList(UserOrderListParam param);
+}

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

@@ -8,7 +8,6 @@ import com.zanxiang.manage.domain.vo.PayBoxListVO;
 import com.zanxiang.mybatis.entity.PayBox;
 import com.zanxiang.mybatis.entity.PayMerchant;
 
-import java.util.List;
 import java.util.Map;
 
 /**

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

@@ -2,6 +2,7 @@ package com.zanxiang.manage.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.zanxiang.manage.domain.dto.UserDTO;
+import com.zanxiang.manage.domain.params.UserUpdateParam;
 import com.zanxiang.manage.domain.vo.UserVO;
 import com.zanxiang.mybatis.entity.User;
 
@@ -15,6 +16,14 @@ import java.util.Map;
  */
 public interface UserService extends IService<User> {
 
+    /**
+     * 用户信息更新
+     *
+     * @param param : 用户更新参数
+     * @return : 返回更新结果
+     */
+    Boolean userUpdate(UserUpdateParam param);
+
     /**
      * 查询玩家详细信息
      *

game-module/game-mybatis/src/main/java/com/zanxiang/mybatis/entity/GameStrategy.java

@@ -1,13 +1,13 @@
 package com.zanxiang.mybatis.entity;
 
-import java.io.Serializable;
-import java.util.Date;
-
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.IdType;
+
+import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 注释游戏策略

game-module/game-mybatis/src/main/java/com/zanxiang/mybatis/entity/GameUserRole.java

@@ -3,7 +3,6 @@ package com.zanxiang.mybatis.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
 import java.math.BigDecimal;

game-module/game-mybatis/src/main/java/com/zanxiang/mybatis/entity/LogPayCp.java

@@ -1,14 +1,14 @@
 package com.zanxiang.mybatis.entity;
 
-import java.io.Serializable;
-import java.util.Date;
-
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.AllArgsConstructor;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.IdType;
+
+import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 注释通知CP记录表

game-module/game-mybatis/src/main/java/com/zanxiang/mybatis/entity/Order.java

@@ -55,7 +55,7 @@ public class Order {
     /**
      * 游戏ID
      */
-    private String gameId;
+    private Long gameId;
 
     /**
      * 货物总价

game-module/game-mybatis/src/main/java/com/zanxiang/mybatis/entity/OrderComplete.java

@@ -1,15 +1,15 @@
 package com.zanxiang.mybatis.entity;
 
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.AllArgsConstructor;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.IdType;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 注释游戏订单全量宽表

game-module/game-mybatis/src/main/java/com/zanxiang/mybatis/entity/PayMerchant.java

@@ -4,10 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.ToString;
 
 import java.io.Serializable;
 import java.math.BigDecimal;

game-module/game-mybatis/src/main/java/com/zanxiang/mybatis/entity/PayWay.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
 
-import java.time.LocalDateTime;
-
 /**
  * @author : lingfeng
  * @time : 2022-06-06

game-module/game-mybatis/src/main/java/com/zanxiang/mybatis/mapper/GameStrategyMapper.java

@@ -1,8 +1,8 @@
 package com.zanxiang.mybatis.mapper;
 
-import org.apache.ibatis.annotations.Mapper;
-import com.zanxiang.mybatis.entity.GameStrategy;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zanxiang.mybatis.entity.GameStrategy;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * 注释游戏策略 Mapper

game-module/game-mybatis/src/main/java/com/zanxiang/mybatis/mapper/LogPayCpMapper.java

@@ -1,8 +1,8 @@
 package com.zanxiang.mybatis.mapper;
 
-import org.apache.ibatis.annotations.Mapper;
-import com.zanxiang.mybatis.entity.LogPayCp;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zanxiang.mybatis.entity.LogPayCp;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * 注释通知CP记录表 Mapper

game-module/game-mybatis/src/main/java/com/zanxiang/mybatis/mapper/OrderCompleteMapper.java

@@ -1,8 +1,8 @@
 package com.zanxiang.mybatis.mapper;
 
-import org.apache.ibatis.annotations.Mapper;
-import com.zanxiang.mybatis.entity.OrderComplete;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zanxiang.mybatis.entity.OrderComplete;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
 * 注释游戏订单全量宽表 Mapper

game-module/game-sdk/src/main/java/com/zanxiang/sdk/common/listener/OrderPaySuccessListener.java

@@ -1,7 +1,6 @@
 package com.zanxiang.sdk.common.listener;
 
 import com.zanxiang.common.utils.StringUtils;
-import com.zanxiang.mybatis.entity.Order;
 import com.zanxiang.sdk.domain.dto.PlatformOrderDTO;
 import com.zanxiang.sdk.service.PerformOrderService;
 import com.zanxiang.sdk.service.PlatformOrderService;

game-module/game-sdk/src/main/java/com/zanxiang/sdk/common/resolver/TokenArgumentResolver.java

@@ -3,7 +3,6 @@ package com.zanxiang.sdk.common.resolver;
 import com.zanxiang.common.enums.HttpStatusEnum;
 import com.zanxiang.common.exception.CustomException;
 import com.zanxiang.common.utils.StringUtils;
-import com.zanxiang.common.utils.bean.BeanUtils;
 import com.zanxiang.sdk.common.annotation.ValidLogin;
 import com.zanxiang.sdk.common.util.DeviceCheckUtil;
 import com.zanxiang.sdk.domain.dto.UserTokenDTO;

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

@@ -1,5 +1,7 @@
 package com.zanxiang.sdk.common.util;
 
+import com.zanxiang.common.utils.MD5Util;
+
 import java.text.SimpleDateFormat;
 import java.util.*;
 

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

@@ -1,6 +1,7 @@
 package com.zanxiang.sdk.common.util;
 
 import com.zanxiang.common.enums.HttpStatusEnum;
+import com.zanxiang.common.utils.MD5Util;
 import org.apache.logging.log4j.util.Strings;
 
 /**

game-module/game-sdk/src/main/java/com/zanxiang/sdk/controller/UserController.java

@@ -1,7 +1,6 @@
 package com.zanxiang.sdk.controller;
 
 import com.zanxiang.common.domain.ResultVo;
-import com.zanxiang.sdk.common.annotation.ValidLogin;
 import com.zanxiang.sdk.domain.params.UpdatePasswordParam;
 import com.zanxiang.sdk.domain.params.UserData;
 import com.zanxiang.sdk.domain.params.UserDetailParam;

game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/Impl/CpServiceImpl.java

@@ -1,6 +1,5 @@
 package com.zanxiang.sdk.service.Impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zanxiang.mybatis.entity.Cp;
 import com.zanxiang.mybatis.mapper.CpMapper;

game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/Impl/LogPayCpServiceImpl.java

@@ -1,9 +1,7 @@
 package com.zanxiang.sdk.service.Impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.mybatis.entity.Cp;
 import com.zanxiang.mybatis.entity.LogPayCp;
-import com.zanxiang.mybatis.mapper.CpMapper;
 import com.zanxiang.mybatis.mapper.LogPayCpMapper;
 import com.zanxiang.sdk.service.LogPayCpService;
 import lombok.extern.slf4j.Slf4j;

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

@@ -1,15 +1,12 @@
 package com.zanxiang.sdk.service.Impl;
 
-import java.math.BigDecimal;
-
 import com.alipay.easysdk.kernel.util.Signer;
 import com.zanxiang.common.enums.CpStatusEnum;
-import com.zanxiang.common.enums.PayDeviceEnum;
 import com.zanxiang.common.enums.ResEnum;
+import com.zanxiang.common.utils.MD5Util;
 import com.zanxiang.common.utils.StringUtils;
 import com.zanxiang.mybatis.entity.*;
 import com.zanxiang.sdk.common.util.HttpUtil;
-import com.zanxiang.sdk.common.util.MD5Util;
 import com.zanxiang.sdk.domain.dto.PlatformOrderDTO;
 import com.zanxiang.sdk.service.*;
 import lombok.extern.slf4j.Slf4j;

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

@@ -6,11 +6,11 @@ import com.zanxiang.common.enums.ExpireTimeEnum;
 import com.zanxiang.common.enums.HttpStatusEnum;
 import com.zanxiang.common.text.UUID;
 import com.zanxiang.common.utils.DateUtils;
+import com.zanxiang.common.utils.MD5Util;
 import com.zanxiang.common.utils.bean.BeanUtils;
 import com.zanxiang.mybatis.entity.UserToken;
 import com.zanxiang.mybatis.mapper.UserTokenMapper;
 import com.zanxiang.sdk.common.constant.RedisKeyConstant;
-import com.zanxiang.sdk.common.util.MD5Util;
 import com.zanxiang.sdk.common.util.RedisUtil;
 import com.zanxiang.sdk.domain.dto.UserTokenDTO;
 import com.zanxiang.sdk.service.UserTokenService;

game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/Impl/pay/PayService.java

@@ -19,12 +19,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;

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

@@ -1,7 +1,6 @@
 package com.zanxiang.sdk.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.zanxiang.mybatis.entity.Cp;
 import com.zanxiang.mybatis.entity.LogPayCp;
 
 /**