feat : 后台功能调试修改

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

@@ -20,7 +20,7 @@ public enum AccountStatusEnum {
     /**
      * 冻结状态
      */
-    FROZEN_STATUS(-1, "冻结状态");
+    FROZEN_STATUS(1, "封禁");
 
     /**
      * 盐值

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

@@ -33,9 +33,6 @@ import java.util.List;
 @Slf4j
 public class UserController {
 
-    @Autowired
-    private UserExtService userExtService;
-
     @Autowired
     private GameUserRoleService gameUserRoleService;
 

game-module/game-manage/src/main/java/com/zanxiang/manage/domain/mapper/GamePayWayListMapper.java

@@ -14,7 +14,7 @@ import org.apache.ibatis.annotations.Select;
  */
 public interface GamePayWayListMapper extends BaseMapper<GamePayWay> {
 
-    @Select("<script> SELECT p.*, g.`name` as gameName,c.`name` as gameType, w.pay_name as payWayName, b.`name` as payBoxName  FROM h_game_pay_way p LEFT JOIN h_game g ON p.game_id = g.id LEFT JOIN h_pay_box b ON p.pay_box_id = b.id LEFT JOIN h_pay_way w ON w.id = p.pay_way_id LEFT JOIN h_game_category c ON g.category = c.id " +
+    @Select("<script> SELECT p.*, g.`name` as gameName,c.`name` as gameType, w.pay_name as payWayName, b.`name` as payBoxName  FROM h_game_pay_way p LEFT JOIN h_game g ON t.game_id = g.id LEFT JOIN t_pay_box b ON p.pay_box_id = b.id LEFT JOIN t_pay_way w ON w.id = p.pay_way_id LEFT JOIN t_game_category c ON g.category = c.id " +
             "where p.is_delete=0 " +
             "<when test='gameName != null'> and g.`name` like CONCAT('%', #{gameName}, '%') </when>" +
             "<when test='payWayId != null'> and p.pay_way_id = #{payWayId} </when>" +

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

@@ -85,6 +85,7 @@ public class GamePayWayServiceImpl extends ServiceImpl<GamePayWayMapper, GamePay
 
     @Override
     public IPage<GamePayWayListVO> list(GamePayWayListParam param) {
+
         Page<GamePayWay> page = new Page<>(param.getPageNum(), param.getPageSize());
         String payWayId = param.getPayWayId() == null ? null : String.valueOf(param.getPayWayId());
         String status = param.getStatus() == null ? null : String.valueOf(param.getStatus());

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

@@ -9,17 +9,20 @@ import com.zanxiang.common.enums.BanStatusEnum;
 import com.zanxiang.common.exception.BaseException;
 import com.zanxiang.common.utils.StringUtils;
 import com.zanxiang.common.utils.bean.BeanUtils;
+import com.zanxiang.erp.security.util.SecurityUtil;
 import com.zanxiang.manage.domain.dto.UserDTO;
 import com.zanxiang.manage.domain.params.UserBanListParam;
 import com.zanxiang.manage.domain.params.UserBanUpdateParam;
 import com.zanxiang.manage.domain.vo.UserBanVO;
 import com.zanxiang.manage.service.UserBanService;
 import com.zanxiang.manage.service.UserService;
+import com.zanxiang.mybatis.entity.User;
 import com.zanxiang.mybatis.entity.UserBan;
 import com.zanxiang.mybatis.mapper.UserBanMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.time.LocalTime;
@@ -78,38 +81,40 @@ public class UserBanServiceImpl extends ServiceImpl<UserBanMapper, UserBan> impl
      * @return : 返回更新结果
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean addOrUpdate(UserBanUpdateParam param) {
-        //查询玩家
+        //查询用户信息
+        UserDTO userDTO = userService.getById(param.getUserId());
+        if (userDTO == null) {
+            throw new BaseException("参数错误, 玩家信息不存在");
+        }
+        //更新用户信息
+        userService.update(new LambdaUpdateWrapper<User>()
+                .set(User::getStatus, param.getStatus())
+                .set(User::getUpdateTime, LocalDateTime.now())
+                .eq(User::getId, param.getUserId()));
+        //查询玩家封禁信息
         UserBan userBan = super.getOne(new LambdaQueryWrapper<UserBan>().eq(UserBan::getUserId, param.getUserId()));
         //已存在的玩家直接更新
         if (userBan != null) {
             return super.update(new LambdaUpdateWrapper<UserBan>()
                     .set(UserBan::getStatus, param.getStatus())
                     .set(UserBan::getBanTime, Objects.equals(param.getStatus(), BanStatusEnum.BAN_STATUS.getStatus()) ? LocalDateTime.now() : null)
-                    .set(UserBan::getOperateId, 1L)
-                    .set(UserBan::getOperateName, "赞象 admin")
+                    .set(UserBan::getOperateId, SecurityUtil.getUserId())
+                    .set(UserBan::getOperateName, SecurityUtil.getTokenInfo().getNickname())
                     .set(UserBan::getUpdateTime, LocalDateTime.now())
-                    .eq(UserBan::getUserId, param.getUserId())
-            );
-        }
-        //玩家信息不存在, 并且是解封状态, 直接过
-        if (Objects.equals(param.getStatus(), BanStatusEnum.NORMAL_STATUS.getStatus())) {
-            return Boolean.TRUE;
-        }
-        //查询玩家用户信息
-        UserDTO userDTO = userService.getById(param.getUserId());
-        if (userDTO == null) {
-            throw new BaseException("参数错误, 玩家信息不存在");
+                    .eq(UserBan::getUserId, param.getUserId()));
         }
+        //添加玩家封禁信息
         return super.save(UserBan.builder()
                 .userId(userDTO.getId())
                 .userName(userDTO.getUsername())
                 .userNickName(userDTO.getNickname())
                 .regTime(userDTO.getCreateTime())
                 .banTime(LocalDateTime.now())
-                .status(BanStatusEnum.BAN_STATUS.getStatus())
-                .operateId(1L)
-                .operateName("赞象 admin")
+                .status(param.getStatus())
+                .operateId(SecurityUtil.getUserId())
+                .operateName(SecurityUtil.getTokenInfo().getNickname())
                 .createTime(LocalDateTime.now())
                 .updateTime(LocalDateTime.now())
                 .build());

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

@@ -1,12 +0,0 @@
-package com.zanxiang.sdk.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zanxiang.mybatis.entity.Cp;
-
-/**
- * @author : xufeng
- * @time : 2022-06-27
- * @description : cp管理
- */
-public interface CpService extends IService<Cp> {
-}

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

@@ -1,19 +0,0 @@
-package com.zanxiang.sdk.service.Impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zanxiang.mybatis.entity.Cp;
-import com.zanxiang.mybatis.mapper.CpMapper;
-import com.zanxiang.sdk.service.CpService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-/**
- * @author : xufeng
- * @time : 2022-06-27
- * @description : cp管理
- */
-@Slf4j
-@Service
-public class CpServiceImpl extends ServiceImpl<CpMapper, Cp> implements CpService {
-
-}

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

@@ -103,7 +103,6 @@ public class HttpUtil {
      */
     private static HttpsURLConnection initHttps(String url) throws Exception {
         TrustManager[] tm = {new MyX509TrustManager()};
-//        System.setProperty("https.protocols", "TLSv1");
         SSLContext sslContext = SSLContext.getInstance("TLS");
         sslContext.init(null, tm, new java.security.SecureRandom());
         // 从上述SSLContext对象中得到SSLSocketFactory对象