feat : 调试修改

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

@@ -1,34 +0,0 @@
-package com.zanxiang.common.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * @author : lingfeng
- * @time : 2022-06-09
- * @description : 账号状态枚举
- */
-@Getter
-@AllArgsConstructor
-public enum AccountStatusEnum {
-
-    /**
-     * 正常状态
-     */
-    NORMAL_STATUS(0, "正常状态"),
-
-    /**
-     * 冻结状态
-     */
-    FROZEN_STATUS(1, "封禁");
-
-    /**
-     * 盐值
-     */
-    private Integer status;
-
-    /**
-     * 描述
-     */
-    private String describe;
-}

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

@@ -1,48 +0,0 @@
-package com.zanxiang.common.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.Arrays;
-import java.util.Objects;
-
-/**
- * @author : lingfeng
- * @time : 2022-06-30
- * @description : 实名认证平台
- */
-@Getter
-@AllArgsConstructor
-public enum AuthPlatform {
-
-
-    /**
-     * 国家网络防沉迷
-     */
-    COUNTRY_PREVENT_WALLOW(1, "国家网络防沉迷");
-
-    /**
-     * 平台id
-     */
-    private Integer platformId;
-
-    /**
-     * 平台名称
-     */
-    private String platformName;
-
-    /**
-     * 根据平台id获取平台信息
-     *
-     * @param platformId : 平台id
-     * @return : 返回信息枚举值
-     */
-    public static AuthPlatform getByPlatformId(Integer platformId) {
-        if (platformId == null) {
-            return null;
-        }
-        return Arrays.stream(AuthPlatform.values())
-                .filter(p -> Objects.equals(platformId, p.getPlatformId()))
-                .findFirst().orElse(null);
-    }
-}

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

@@ -18,9 +18,9 @@ public enum BanStatusEnum {
     NORMAL_STATUS(0, "正常"),
 
     /**
-     * 封禁
+     * 冻结/封禁 状态
      */
-    BAN_STATUS(1, "封禁");
+    BAN_STATUS(1, " 冻结/封禁 状态");
 
     /**
      * 状态

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

@@ -1,44 +0,0 @@
-package com.zanxiang.common.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * @author : lingfeng
- * @time : 2022-07-13
- * @description : 游戏应用类型
- */
-@Getter
-@AllArgsConstructor
-public enum CategoryTypeEnum {
-
-    /**
-     * 微信小游戏
-     */
-    CATEGORY_TYPE_WX(1L, "微信小游戏"),
-
-    /**
-     * 抖音小游戏
-     */
-    CATEGORY_TYPE_DY(2L, "抖音小游戏"),
-
-    /**
-     * h5游戏
-     */
-    CATEGORY_TYPE_H5(3L, "h5游戏"),
-
-    /**
-     * app游戏
-     */
-    CATEGORY_TYPE_APP(4L, "app游戏");
-
-    /**
-     * 设备类型
-     */
-    private Long categoryType;
-
-    /**
-     * 描述
-     */
-    private String name;
-}

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

@@ -1,24 +1,38 @@
 package com.zanxiang.common.enums;
 
+import lombok.AllArgsConstructor;
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 
 /**
  * @author xufeng
  * @date 2022/6/27 14:31
  */
 @Getter
-@NoArgsConstructor
+@AllArgsConstructor
 public enum CpStatusEnum {
-    FAILLE(-1, "失败"),
+
+    /**
+     * 同步失败
+     */
+    FAIL(-1, "失败"),
+
+    /**
+     * 待同步
+     */
     READY(1, "待同步"),
+
+    /**
+     * 同步成功
+     */
     SUCCESS(2, "同步成功");
 
-    private int code;
-    private String msg;
+    /**
+     * 类型
+     */
+    private Integer status;
 
-    CpStatusEnum(int code, String msg) {
-        this.code = code;
-        this.msg = msg;
-    }
+    /**
+     * 描述
+     */
+    private String desc;
 }

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

@@ -1,23 +1,33 @@
 package com.zanxiang.common.enums;
 
+import lombok.AllArgsConstructor;
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 
 /**
  * @author xufeng
  * @date 2022/6/13 11:39
  */
 @Getter
-@NoArgsConstructor
+@AllArgsConstructor
 public enum DeleteEnum {
+
+    /**
+     * 正常
+     */
     NO(0, "正常"),
+
+    /**
+     * 已删除
+     */
     YES(1, "已删除");
 
+    /**
+     *
+     */
     private int code;
-    private String name;
 
-    DeleteEnum(int code, String name) {
-        this.code = code;
-        this.name = name;
-    }
+    /**
+     * 状态
+     */
+    private String name;
 }

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

@@ -5,30 +5,40 @@ import lombok.Getter;
 
 /**
  * @author : lingfeng
- * @time : 2022-06-23
- * @description : 游戏分类标签
+ * @time : 2022-07-13
+ * @description : 游戏应用类型
  */
 @Getter
 @AllArgsConstructor
 public enum GameCategoryEnum {
 
     /**
-     * 游戏类型（微信小游戏/抖音小游戏/h5/app等）
+     * 微信小游戏
      */
-    GAME_TYPE(1, "游戏类型（微信小游戏/抖音小游戏/h5/app等）"),
+    CATEGORY_TYPE_WX(1L, "微信小游戏"),
 
     /**
-     * 游戏分类（策略游戏/卡牌游戏/）
+     * 抖音小游戏
      */
-    GAME_LABEL(2, "游戏分类（策略游戏/卡牌游戏/）");
+    CATEGORY_TYPE_DY(2L, "抖音小游戏"),
+
+    /**
+     * h5游戏
+     */
+    CATEGORY_TYPE_H5(3L, "h5游戏"),
+
+    /**
+     * app游戏
+     */
+    CATEGORY_TYPE_APP(4L, "app游戏");
 
     /**
      * 设备类型
      */
-    private Integer categoryType;
+    private Long categoryType;
 
     /**
      * 描述
      */
-    private String describe;
+    private String name;
 }

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

@@ -1,22 +0,0 @@
-package com.zanxiang.common.enums;
-
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-
-/**
- * @author xufeng
- * @date 2022/6/13 11:39
- */
-@Getter
-@NoArgsConstructor
-public enum GameStrategyTypeEnum {
-    ORDER(1, "订单起量规则");
-
-    private int code;
-    private String name;
-
-    GameStrategyTypeEnum(int code, String name) {
-        this.code = code;
-        this.name = name;
-    }
-}

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

@@ -15,12 +15,17 @@ public enum HttpStatusEnum {
     /**
      * 成功
      */
-    SUCCESS(200, "成功"),
+    SUCCESS(200, "success"),
+
+    /**
+     * 失败
+     */
+    FAIL(400, "failed"),
 
     /**
      * 服务器异常
      */
-    FAIL(500, "服务器异常"),
+    ERROR(500, "服务器异常"),
 
     /**
      * 未知错误

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

@@ -1,23 +1,33 @@
 package com.zanxiang.common.enums;
 
+import lombok.AllArgsConstructor;
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 
 /**
  * @author xufeng
  * @date 2022/6/13 13:39
  */
 @Getter
-@NoArgsConstructor
+@AllArgsConstructor
 public enum MaxPayLock {
+
+    /**
+     * 已锁定
+     */
     LOCK(1, "已锁定"),
+
+    /**
+     * 未锁定
+     */
     UNLOCK(0, "未锁定");
 
-    private int code;
-    private String name;
+    /**
+     * 状态
+     */
+    private Integer code;
 
-    MaxPayLock(int code, String name) {
-        this.code = code;
-        this.name = name;
-    }
+    /**
+     * 描述
+     */
+    private String name;
 }

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

@@ -1,39 +0,0 @@
-package com.zanxiang.common.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * @author : lingfeng
- * @time : 2022-10-26
- * @description : 推广媒体
- */
-@Getter
-@AllArgsConstructor
-public enum MediaType {
-
-    /**
-     * 社交
-     */
-    SOCIAL_CONTACT("社交"),
-
-    /**
-     * 短视频
-     */
-    SHORT_VIDEO("短视频"),
-
-    /**
-     * 视频
-     */
-    VIDEO("视频"),
-
-    /**
-     * 资讯
-     */
-    NEWS_INFO("资讯");
-
-    /**
-     * 推广媒体
-     */
-    private String mediaType;
-}

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

@@ -1,24 +1,39 @@
 package com.zanxiang.common.enums;
 
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @author : lingfeng
+ * @time : 2022-06-07
+ * @description : 用户状态
+ */
+@Getter
+@AllArgsConstructor
 public enum OrderStateEnum {
+
+    /**
+     * 待支付
+     */
     NO_PAY(1, "待支付"),
+
+    /**
+     * 支付成功
+     */
     SUCCESS(2, "支付成功"),
-    CANCEL(-1, "取消");
 
-    OrderStateEnum(Integer code, String msg) {
-        this.code = code;
-        this.msg = msg;
-    }
+    /**
+     * 取消
+     */
+    CANCEL(-1, "取消");
 
+    /**
+     * 状态
+     */
     private final Integer code;
 
+    /**
+     * 描述
+     */
     private final String msg;
-
-    public Integer getCode() {
-        return code;
-    }
-
-    public String getMsg() {
-        return msg;
-    }
 }

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

@@ -3,6 +3,8 @@ package com.zanxiang.common.enums;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
+import java.util.Objects;
+
 /**
  * @author : lingfeng
  * @time : 2022-06-30
@@ -15,32 +17,37 @@ public enum OsEnum {
     /**
      * 安卓
      */
-    SYSTEM_ANDROID("android", "安卓手机操作系统"),
+    SYSTEM_ANDROID(1, "android", "安卓手机操作系统"),
 
     /**
      * 苹果
      */
-    SYSTEM_IOS("ios", "苹果手机操作系统"),
+    SYSTEM_IOS(2, "ios", "苹果手机操作系统"),
 
     /**
      * window操作系统
      */
-    SYSTEM_WINDOW("windows", "window操作系统"),
+    SYSTEM_WINDOW(3, "windows", "window操作系统"),
 
     /**
      * Mac操作系统
      */
-    SYSTEM_MAC("mac", "Mac操作系统"),
+    SYSTEM_MAC(4, "mac", "Mac操作系统"),
 
     /**
      * linux操作系统
      */
-    SYSTEM_LINUX("linux", "linux操作系统"),
+    SYSTEM_LINUX(5, "linux", "linux操作系统"),
 
     /**
      * 其它操作系统
      */
-    SYSTEM_OTHER("other", "other操作系统");
+    SYSTEM_OTHER(0, "other", "other操作系统");
+
+    /**
+     * 数据类型
+     */
+    private Integer osType;
 
     /**
      * 平台id
@@ -51,4 +58,20 @@ public enum OsEnum {
      * 平台名称
      */
     private String osName;
+
+
+    /**
+     * 得到名字
+     *
+     * @param name 名字
+     * @return {@link Integer}
+     */
+    public static Integer getByName(String name) {
+        for (OsEnum osEnum : OsEnum.values()) {
+            if (Objects.equals(name, osEnum.getOsName())) {
+                return osEnum.getOsType();
+            }
+        }
+        return OsEnum.SYSTEM_OTHER.osType;
+    }
 }

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

@@ -0,0 +1,44 @@
+package com.zanxiang.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @author : lingfeng
+ * @time : 2022-11-17
+ * @description : 推广媒体类型
+ */
+@Getter
+@AllArgsConstructor
+public enum PromoMediaTypeEnum {
+
+    /**
+     * 社交类
+     */
+    MEDIA_SOCIAL_CONTACT(1, "社交类"),
+
+    /**
+     * 短视频
+     */
+    MEDIA_SHORT_VIDEO(2, "短视频"),
+
+    /**
+     * 资讯
+     */
+    MEDIA_NEWS_INFO(3, "资讯"),
+
+    /**
+     * 视频
+     */
+    MEDIA_VIDEO(4, "视频");
+
+    /**
+     * 媒体类型
+     */
+    private Integer type;
+
+    /**
+     * 媒体名称
+     */
+    private String name;
+}

game-module/game-common/src/main/java/com/zanxiang/common/enums/ProviderEnum.java → game-module/game-common/src/main/java/com/zanxiang/common/enums/PromoProviderEnum.java

@@ -6,29 +6,34 @@ import lombok.Getter;
 /**
  * @author : lingfeng
  * @time : 2022-10-26
- * @description : 服务商
+ * @description : 推广服务商
  */
 @Getter
 @AllArgsConstructor
-public enum ProviderEnum {
+public enum PromoProviderEnum {
 
     /**
      * 巨网
      */
-    JU_GU("巨网"),
+    JU_GU(1, "巨网"),
 
     /**
      * 广联
      */
-    GUANG_LIAN("短视频"),
+    GUANG_LIAN(2, "广联"),
 
     /**
      * 太古
      */
-    TAI_GU("太古");
+    TAI_GU(3, "太古");
+
+    /**
+     * 推广服务商id
+     */
+    private Integer providerId;
 
     /**
      * 推广媒体
      */
-    private String provider;
+    private String providerName;
 }

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

@@ -1,28 +0,0 @@
-package com.zanxiang.common.enums;
-
-public enum ResEnum {
-    SUCCESS(200, "success"),//勿修改，影响支付响应
-    FAIL(400, "failed"),//勿修改，影响支付响应
-    TO_LOGIN(310, "登录失效，请重新登录！"),
-    ERROR(500, "系统异常"),
-    REMOTE_SERVER_FAIL(503, "远程服务调用失败"),
-    LOGIN_FAIL(1001, "用户名或密码错误"),
-    AD_NO_LOGIN(1003, "腾讯广告平台未登录或登录失效");
-
-    ResEnum(int code, String msg) {
-        this.code = code;
-        this.msg = msg;
-    }
-
-    private final int code;
-
-    private final String msg;
-
-    public int getCode() {
-        return code;
-    }
-
-    public String getMsg() {
-        return msg;
-    }
-}

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

@@ -1,23 +1,33 @@
 package com.zanxiang.common.enums;
 
+import lombok.AllArgsConstructor;
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 
 /**
  * @author xufeng
  * @date 2022/6/13 11:39
  */
 @Getter
-@NoArgsConstructor
+@AllArgsConstructor
 public enum StatusEnum {
+
+    /**
+     * 正常
+     */
     YES(0, "正常"),
+
+    /**
+     * 禁止
+     */
     NO(1, "禁止");
 
+    /**
+     * 状态
+     */
     private int code;
-    private String name;
 
-    StatusEnum(int code, String name) {
-        this.code = code;
-        this.name = name;
-    }
+    /**
+     * 描述
+     */
+    private String name;
 }

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

@@ -3,7 +3,7 @@ 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.extension.service.impl.ServiceImpl;
-import com.zanxiang.common.enums.CategoryTypeEnum;
+import com.zanxiang.common.enums.GameCategoryEnum;
 import com.zanxiang.common.utils.bean.BeanUtils;
 import com.zanxiang.manage.domain.dto.GameDTO;
 import com.zanxiang.manage.domain.params.GamePictureParam;
@@ -62,11 +62,11 @@ public class GamePictureServiceImpl extends ServiceImpl<GamePictureMapper, GameP
     public Boolean addOrUpdate(GamePictureParam param) {
         GameDTO gameDTO = gameService.getById(param.getGameId());
         //微信小游戏更新
-        if (Objects.equals(gameDTO.getCategory(), CategoryTypeEnum.CATEGORY_TYPE_WX.getCategoryType())) {
+        if (Objects.equals(gameDTO.getCategory(), GameCategoryEnum.CATEGORY_TYPE_WX.getCategoryType())) {
             return this.appletGameAddOrUpdate(param);
         }
         //h5游戏更新
-        if (Objects.equals(gameDTO.getCategory(), CategoryTypeEnum.CATEGORY_TYPE_H5.getCategoryType())) {
+        if (Objects.equals(gameDTO.getCategory(), GameCategoryEnum.CATEGORY_TYPE_H5.getCategoryType())) {
             return this.h5GameAddOrUpdate(param);
         }
         return Boolean.FALSE;

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

@@ -0,0 +1,17 @@
+package com.zanxiang.manage.service.Impl;
+
+import com.zanxiang.manage.service.PromoMediaService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author : lingfeng
+ * @time : 2022-11-17
+ * @description : 推广媒体
+ */
+@Slf4j
+@Service
+public class PromoMediaServiceImpl implements PromoMediaService {
+
+
+}

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

@@ -0,0 +1,9 @@
+package com.zanxiang.manage.service;
+
+/**
+ * @author : lingfeng
+ * @time : 2022-11-17
+ * @description : 推广媒体
+ */
+public interface PromoMediaService {
+}

game-module/game-sdk/src/main/java/com/zanxiang/sdk/enums/OsTypeEnum.java

@@ -1,67 +0,0 @@
-package com.zanxiang.sdk.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.Objects;
-
-/**
- * @author : lingfeng
- * @time : 2022-11-10
- * @description : 回传系统类型
- */
-@Getter
-@AllArgsConstructor
-public enum OsTypeEnum {
-
-    /**
-     * android
-     */
-    OS_ANDROID(1, "android"),
-
-    /**
-     * ios
-     */
-    OS_IOS(2, "ios"),
-
-    /**
-     * windows
-     */
-    OS_WINDOWS(3, "windows"),
-
-    /**
-     * mac
-     */
-    OS_MAC(4, "mac"),
-
-    /**
-     * 其他
-     */
-    OS_OTHER(0, "其他");
-
-    /**
-     * 数据类型
-     */
-    private Integer osType;
-
-    /**
-     * 描述
-     */
-    private String name;
-
-    /**
-     * 得到名字
-     *
-     * @param name 操作系统类型
-     * @return {@link OsTypeEnum}
-     */
-    public static Integer getByName(String name) {
-        for (OsTypeEnum osTypeEnum : OsTypeEnum.values()) {
-            if (Objects.equals(name, osTypeEnum.getName())) {
-                return osTypeEnum.getOsType();
-            }
-        }
-        return null;
-    }
-
-}

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

@@ -8,12 +8,12 @@ import com.zanxiang.advertising.oceanengine.track.base.pojo.rpc.IAppOrderRpc;
 import com.zanxiang.advertising.oceanengine.track.base.pojo.rpc.IAppUserRpc;
 import com.zanxiang.advertising.oceanengine.track.base.pojo.vo.AppReportLogRpcVO;
 import com.zanxiang.common.enums.CallBackEnum;
+import com.zanxiang.common.enums.OsEnum;
 import com.zanxiang.module.util.JsonUtil;
 import com.zanxiang.module.util.pojo.ResultVO;
 import com.zanxiang.mybatis.entity.Order;
 import com.zanxiang.mybatis.entity.User;
 import com.zanxiang.sdk.domain.dto.PlatformOrderDTO;
-import com.zanxiang.sdk.enums.OsTypeEnum;
 import com.zanxiang.sdk.enums.PayTypeEnum;
 import com.zanxiang.sdk.service.CallBackService;
 import com.zanxiang.sdk.service.OrderService;
@@ -65,7 +65,7 @@ public class CallBackServiceImpl implements CallBackService {
                 .imei(user.getImei())
                 .androidId(user.getAndroidId())
                 .ip(user.getIp())
-                .osType(OsTypeEnum.getByName(user.getDeviceSystem()))
+                .osType(OsEnum.getByName(user.getDeviceSystem()))
                 .registerTime(user.getCreateTime())
                 .build();
         //调接口

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

@@ -2,7 +2,7 @@ package com.zanxiang.sdk.service.Impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.zanxiang.common.domain.ResultVO;
-import com.zanxiang.common.enums.AccountStatusEnum;
+import com.zanxiang.common.enums.BanStatusEnum;
 import com.zanxiang.common.enums.HttpStatusEnum;
 import com.zanxiang.common.enums.SmsTypeEnum;
 import com.zanxiang.common.exception.BaseException;
@@ -138,7 +138,7 @@ public class LoginServiceImpl implements RegisterLoginService {
                 return new ResultVO<>(HttpStatusEnum.USERNAME_OR_PASSWORD_ERR);
             }
             //判断账号是否停用
-            if (Objects.equals(AccountStatusEnum.FROZEN_STATUS.getStatus(), user.getStatus())) {
+            if (Objects.equals(BanStatusEnum.BAN_STATUS.getStatus(), user.getStatus())) {
                 return new ResultVO<>(HttpStatusEnum.ACCOUNT_HALT);
             }
             //验证密码
@@ -159,7 +159,7 @@ public class LoginServiceImpl implements RegisterLoginService {
                     .nickname(RegisterUtil.randomNickName(username))
                     .password(RegisterUtil.cmfPassword(password))
                     .deviceType(userData.getDeviceType())
-                    .status(AccountStatusEnum.NORMAL_STATUS.getStatus())
+                    .status(BanStatusEnum.NORMAL_STATUS.getStatus())
                     .authentication(0)
                     .createTime(LocalDateTime.now())
                     .updateTime(LocalDateTime.now())
@@ -209,7 +209,7 @@ public class LoginServiceImpl implements RegisterLoginService {
                     .nickname(RegisterUtil.randomNickName(mobile))
                     .mobile(mobile)
                     .deviceType(userData.getDeviceType())
-                    .status(AccountStatusEnum.NORMAL_STATUS.getStatus())
+                    .status(BanStatusEnum.NORMAL_STATUS.getStatus())
                     .authentication(0)
                     .createTime(LocalDateTime.now())
                     .updateTime(LocalDateTime.now())
@@ -224,7 +224,7 @@ public class LoginServiceImpl implements RegisterLoginService {
             callBackService.userCallBack(user);
         } else {
             //判断账号是否停用
-            if (Objects.equals(AccountStatusEnum.FROZEN_STATUS.getStatus(), user.getStatus())) {
+            if (Objects.equals(BanStatusEnum.BAN_STATUS.getStatus(), user.getStatus())) {
                 return new ResultVO<>(HttpStatusEnum.ACCOUNT_HALT);
             }
         }

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

@@ -69,7 +69,7 @@ public class PerformOrderServiceImpl implements PerformOrderService {
     @Override
     public Boolean pushCp(PlatformOrderDTO orderInfo) {
         log.info("充值回调CP, orderInfo : {} ----------start---------", JsonUtil.toString(orderInfo));
-        if (orderInfo.getCpStatus() == CpStatusEnum.SUCCESS.getCode()) {
+        if (Objects.equals(orderInfo.getCpStatus(), CpStatusEnum.SUCCESS.getStatus())) {
             return true;
         }
         GameExt gameExt = gameExtService.getByGameId(orderInfo.getGameId());
@@ -102,7 +102,7 @@ public class PerformOrderServiceImpl implements PerformOrderService {
         orderService.update(new LambdaUpdateWrapper<Order>()
                 .set(Order::getCpNotifyCnt, orderInfo.getCpNotifyCnt() + 1)
                 .set(Order::getLastCpNotifyTime, LocalDateTime.now())
-                .set(Order::getCpStatus, pushSuccess ? CpStatusEnum.SUCCESS.getCode() : CpStatusEnum.FAILLE.getCode())
+                .set(Order::getCpStatus, pushSuccess ? CpStatusEnum.SUCCESS.getStatus() : CpStatusEnum.FAIL.getStatus())
                 .set(pushSuccess, Order::getEndTime, LocalDateTime.now())
                 .eq(Order::getOrderId, orderInfo.getOrderId())
         );
@@ -111,7 +111,7 @@ public class PerformOrderServiceImpl implements PerformOrderService {
         logPayCp.setOrderId(orderInfo.getOrderId());
         logPayCp.setCpOrderId(orderInfo.getCpOrderId());
         logPayCp.setStatus(orderInfo.getStatus());
-        logPayCp.setCpStatus(pushSuccess ? CpStatusEnum.SUCCESS.getCode() : CpStatusEnum.FAILLE.getCode());
+        logPayCp.setCpStatus(pushSuccess ? CpStatusEnum.SUCCESS.getStatus() : CpStatusEnum.FAIL.getStatus());
         logPayCp.setCpPaybackUrl(cpPaybackUrl);
         logPayCp.setParams(JsonUtil.toString(map));
         logPayCp.setExt(orderInfo.getExt());

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

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zanxiang.common.constant.Constants;
 import com.zanxiang.common.domain.ResultVO;
-import com.zanxiang.common.enums.AccountStatusEnum;
+import com.zanxiang.common.enums.BanStatusEnum;
 import com.zanxiang.common.enums.ExpireTimeEnum;
 import com.zanxiang.common.exception.BaseException;
 import com.zanxiang.common.text.UUID;
@@ -117,7 +117,7 @@ public class UserTokenServiceImpl extends ServiceImpl<UserTokenMapper, UserToken
         //查询用户信息
         User user = userService.getById(userData.getUserId());
         //判断账号是否停用
-        if (Objects.equals(AccountStatusEnum.FROZEN_STATUS.getStatus(), user.getStatus())) {
+        if (Objects.equals(BanStatusEnum.BAN_STATUS.getStatus(), user.getStatus())) {
             return Boolean.FALSE;
         }
         //token检测

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

@@ -11,7 +11,6 @@ import com.zanxiang.common.constant.Constants;
 import com.zanxiang.common.domain.ResultMap;
 import com.zanxiang.common.enums.HttpStatusEnum;
 import com.zanxiang.common.enums.OsEnum;
-import com.zanxiang.common.enums.ResEnum;
 import com.zanxiang.module.util.JsonUtil;
 import com.zanxiang.sdk.domain.bo.ProductPayParamBO;
 import com.zanxiang.sdk.util.HttpUtil;
@@ -121,14 +120,14 @@ public class AliPayService extends PayBaseService {
             if (flag) {
                 if (paySuccess(orderNo, params.get("total_amount"), params.get("trade_no"), gamePayWayId)) {
                     log.info("支付宝异步回调成功 request:{},orderNo:{},商户订单号为：{}", request, orderNo, params.get("trade_no"));
-                    return ResEnum.SUCCESS.getMsg();
+                    return HttpStatusEnum.SUCCESS.getMsg();
                 }
             }
             log.error("支付宝异步回调-验证签名失败 request:{}", request);
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return ResEnum.FAIL.getMsg();
+        return HttpStatusEnum.FAIL.getMsg();
     }
 
     /**
@@ -193,7 +192,7 @@ public class AliPayService extends PayBaseService {
             //请求失败
             if (!ResponseChecker.success(response)) {
                 log.error("支付宝h5支付失败，product : {}, response : {}", JsonUtil.toString(product), JsonUtil.toString(response));
-                return ResultMap.error(ResEnum.FAIL.getMsg());
+                return ResultMap.error(HttpStatusEnum.FAIL.getMsg());
             }
             HashMap<String, String> result = new HashMap<>();
             String body = response.getBody();
@@ -235,7 +234,7 @@ public class AliPayService extends PayBaseService {
             return ResultMap.ok(product.getPayDevice(), result.get("appLink"), product.getOutTradeNo());
         } catch (Exception e) {
             log.error("支付宝h5支付失败，meg : {}", e.getMessage());
-            return ResultMap.error(ResEnum.FAIL.getMsg());
+            return ResultMap.error(HttpStatusEnum.FAIL.getMsg());
         }
     }
 
@@ -255,11 +254,11 @@ public class AliPayService extends PayBaseService {
             if (ResponseChecker.success(response)) {
                 return ResultMap.ok(product.getPayDevice(), response.getBody(), product.getOutTradeNo());
             } else {
-                return ResultMap.error(ResEnum.FAIL.getMsg());
+                return ResultMap.error(HttpStatusEnum.FAIL.getMsg());
             }
         } catch (Exception e) {
             log.error("pc端支付生成异常 e:{}", e.getMessage());
-            return ResultMap.error(ResEnum.FAIL.getMsg());
+            return ResultMap.error(HttpStatusEnum.FAIL.getMsg());
         }
     }
 
@@ -277,12 +276,12 @@ public class AliPayService extends PayBaseService {
             if (ResponseChecker.success(response)) {
                 return ResultMap.ok(product.getPayDevice(), response.getBody(), product.getOutTradeNo());
             } else {
-                return ResultMap.error(ResEnum.FAIL.getMsg());
+                return ResultMap.error(HttpStatusEnum.FAIL.getMsg());
             }
         } catch (Exception e) {
             e.printStackTrace();
             log.error("app端支付生成异常 e:{}", e.getMessage());
-            return ResultMap.error(ResEnum.FAIL.getMsg());
+            return ResultMap.error(HttpStatusEnum.FAIL.getMsg());
         }
     }
 

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

@@ -2,7 +2,7 @@ package com.zanxiang.sdk.service.pay;
 
 import com.zanxiang.common.constant.Constants;
 import com.zanxiang.common.domain.ResultMap;
-import com.zanxiang.common.enums.ResEnum;
+import com.zanxiang.common.enums.HttpStatusEnum;
 import com.zanxiang.common.exception.BaseException;
 import com.zanxiang.common.utils.URIUtil;
 import com.zanxiang.module.util.JsonUtil;
@@ -141,7 +141,7 @@ public class WxPayService extends PayBaseService {
         out.write(XmlUtil.mapToXml(xmlMap).getBytes());
         out.flush();
         out.close();
-        return ResEnum.SUCCESS.getMsg();
+        return HttpStatusEnum.SUCCESS.getMsg();
     }
 
     private ResultMap pcPay(ProductPayParamBO product) {