Jelajahi Sumber

feat : 接口对接口调试修改

bilingfeng 2 tahun lalu
induk
melakukan
d43a82c212
18 mengubah file dengan 50 tambahan dan 669 penghapusan
  1. 3 3
      game-module/game-sdk/src/main/java/com/zanxiang/sdk/controller/LoginController.java
  2. 5 4
      game-module/game-sdk/src/main/java/com/zanxiang/sdk/controller/UserController.java
  3. 0 48
      game-module/game-sdk/src/main/java/com/zanxiang/sdk/domain/params/GameUserUpdateParam.java
  4. 0 15
      game-module/game-sdk/src/main/java/com/zanxiang/sdk/domain/params/MPayBalanceParam.java
  5. 0 20
      game-module/game-sdk/src/main/java/com/zanxiang/sdk/domain/params/OrderCheckInfoParam.java
  6. 0 107
      game-module/game-sdk/src/main/java/com/zanxiang/sdk/domain/params/PlatformOrderParam.java
  7. 0 52
      game-module/game-sdk/src/main/java/com/zanxiang/sdk/domain/params/PreOrderParam.java
  8. 0 51
      game-module/game-sdk/src/main/java/com/zanxiang/sdk/domain/params/RegisterMobileParam.java
  9. 0 33
      game-module/game-sdk/src/main/java/com/zanxiang/sdk/domain/params/RegisterPasswordParam.java
  10. 0 22
      game-module/game-sdk/src/main/java/com/zanxiang/sdk/domain/params/UserCheckParam.java
  11. 0 24
      game-module/game-sdk/src/main/java/com/zanxiang/sdk/domain/params/UserDetailParam.java
  12. 0 41
      game-module/game-sdk/src/main/java/com/zanxiang/sdk/domain/params/UserOauthlUpdateParam.java
  13. 0 22
      game-module/game-sdk/src/main/java/com/zanxiang/sdk/domain/vo/MiniAppConfigVO.java
  14. 0 158
      game-module/game-sdk/src/main/java/com/zanxiang/sdk/domain/vo/PlatformOrderVO.java
  15. 19 31
      game-module/game-sdk/src/main/java/com/zanxiang/sdk/domain/vo/UserVO.java
  16. 0 11
      game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/Impl/UserOauthServiceImpl.java
  17. 16 22
      game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/Impl/UserServiceImpl.java
  18. 7 5
      game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/UserService.java

+ 3 - 3
game-module/game-sdk/src/main/java/com/zanxiang/sdk/controller/LoginController.java

@@ -56,20 +56,20 @@ public class LoginController {
     }
 
     @ApiOperation(value = "用户退出")
-    @PostMapping("/sign/out")
+    @GetMapping("/sign/out")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = UserLoginVO.class)})
     public ResultVO<Boolean> loginOut() {
         return ResultVO.ok();
     }
 
     @ApiOperation(value = "用户账号注销")
-    @PostMapping("/write/off")
+    @GetMapping("/write/off")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = UserLoginVO.class)})
     public ResultVO<Boolean> writeOff() {
         return ResultVO.ok();
     }
 
-    //------------------------- QQ和微信的授权登录接口 -------------------------
+    //-------------------------------- 微信和QQ授权登录(暂时没有用到) --------------------------------
 
 //    @ApiOperation(value = "用户QQ授权登录")
 //    @GetMapping("/register/login/qq")

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

@@ -5,6 +5,7 @@ import com.zanxiang.sdk.annotation.ValidLogin;
 import com.zanxiang.sdk.domain.params.*;
 import com.zanxiang.sdk.domain.vo.CustomerVO;
 import com.zanxiang.sdk.domain.vo.UserLoginVO;
+import com.zanxiang.sdk.domain.vo.UserVO;
 import com.zanxiang.sdk.service.UserCardService;
 import com.zanxiang.sdk.service.UserService;
 import io.swagger.annotations.Api;
@@ -60,10 +61,10 @@ public class UserController {
     }
 
     @ApiOperation(value = "获取用户信息")
-    @PostMapping("/get/user/detail")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = UserLoginVO.class)})
-    public ResultVO getUserDetail(@Validated @RequestBody UserDetailParam userDetailParam, UserData userData) {
-        return userService.getUserDetail(userDetailParam, userData);
+    @GetMapping("/get/detail")
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = UserVO.class)})
+    public ResultVO<UserVO> getUserDetail(@ValidLogin UserData userData) {
+        return ResultVO.ok(userService.getUserDetail(userData));
     }
 
     @ApiOperation(value = "获取客服信息")

+ 0 - 48
game-module/game-sdk/src/main/java/com/zanxiang/sdk/domain/params/GameUserUpdateParam.java

@@ -1,48 +0,0 @@
-package com.zanxiang.sdk.domain.params;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.time.LocalDateTime;
-
-/**
- * 游戏用户创建
- *
- * @author : xufeng
- * @time : 2022-07-21
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class GameUserUpdateParam extends CommonParam {
-
-    @ApiModelProperty("所属渠道ID")
-    private Long agentId;
-
-    @ApiModelProperty("导量的渠道ID")
-    private Long guidedAgentId;
-
-    @ApiModelProperty("昵称")
-    private String nickname;
-
-    @ApiModelProperty("最近默认 2 默认 1 不默认")
-    private Boolean isDefault;
-
-    @ApiModelProperty("状态 2正常 1锁定")
-    private Boolean status;
-
-    @ApiModelProperty("是否GS")
-    private Boolean isGs;
-
-    @ApiModelProperty("客服id")
-    private Long customerId;
-
-    @ApiModelProperty("创角数")
-    private Integer roleCount;
-
-    @ApiModelProperty("拥有角色最高vip等级")
-    private Integer roleVipMax;
-
-    @ApiModelProperty("最后玩时间")
-    private LocalDateTime updateTime;
-}

+ 0 - 15
game-module/game-sdk/src/main/java/com/zanxiang/sdk/domain/params/MPayBalanceParam.java

@@ -1,15 +0,0 @@
-package com.zanxiang.sdk.domain.params;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotNull;
-
-@Data
-public class MPayBalanceParam extends CommonParam {
-
-    @ApiModelProperty("orderId")
-    @NotNull(message = "orderId不可为空")
-    private String orderId;
-
-}

+ 0 - 20
game-module/game-sdk/src/main/java/com/zanxiang/sdk/domain/params/OrderCheckInfoParam.java

@@ -1,20 +0,0 @@
-package com.zanxiang.sdk.domain.params;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotNull;
-
-@Data
-public class OrderCheckInfoParam extends CommonParam {
-
-    @ApiModelProperty("orderId")
-    @NotNull(message = "orderId不可为空")
-    private String orderId;
-
-
-    @ApiModelProperty("userId")
-    @NotNull(message = "userId不可为空")
-    private String userId;
-
-}

+ 0 - 107
game-module/game-sdk/src/main/java/com/zanxiang/sdk/domain/params/PlatformOrderParam.java

@@ -1,107 +0,0 @@
-package com.zanxiang.sdk.domain.params;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-@Data
-public class PlatformOrderParam {
-
-    private String id;
-
-    @ApiModelProperty("cpId")
-    private String cpId;
-
-    @ApiModelProperty("CP订单号")
-    private String cpOrderId;
-
-    @ApiModelProperty("充值用户")
-    private String userId;
-
-    @ApiModelProperty("游戏玩家ID")
-    private String mgUserId;
-
-    @ApiModelProperty("角色id")
-    private String roleId;
-
-    @ApiModelProperty("游戏ID")
-    private String gameId;
-
-    @ApiModelProperty("货物总价")
-    private BigDecimal amount;
-
-    @ApiModelProperty("实际支付金额")
-    private BigDecimal realAmount;
-
-    @ApiModelProperty("游戏商品ID")
-    private String productId;
-
-    @ApiModelProperty("游戏商品数量")
-    private Integer productCnt;
-
-    @ApiModelProperty("游戏商品名称")
-    private String productName;
-
-    @ApiModelProperty("优惠券抵扣")
-    private BigDecimal couponAmount;
-
-    @ApiModelProperty("平台币使用金额")
-    private BigDecimal ptbAmount;
-
-    @ApiModelProperty("游戏币使用余额")
-    private BigDecimal gmAmount;
-
-    @ApiModelProperty("使用积分")
-    private Integer integral;
-
-    @ApiModelProperty("使用积分抵多少钱")
-    private BigDecimal integralMoney;
-
-    @ApiModelProperty("返利数量 默认为0")
-    private BigDecimal rebateAmount;
-
-    @ApiModelProperty("支付平台返回交易订单号")
-    private String merchantOrderNo;
-
-    @ApiModelProperty("支付状态,1待支付,2 支付成功,-1 已取消")
-    private Integer status;
-
-    @ApiModelProperty("支付方式")
-    private String gamePaywayId;
-
-    @ApiModelProperty("支付时间")
-    private Date payTime;
-
-    @ApiModelProperty("通知次数")
-    private Integer cpNotifyCnt;
-
-    @ApiModelProperty("最近通知时间")
-    private Long lastCpNotifyTime;
-
-    @ApiModelProperty("客服处理: 2正常; 1纠纷")
-    private Integer isHandle;
-
-    @ApiModelProperty("是否已分成  1未分成 2 已分成")
-    private Integer isDistribute;
-
-    @ApiModelProperty("CP通知状态,1为待处理,2为成功,-1为失败")
-    private Integer cpStatus;
-
-    @ApiModelProperty("CP附加参数")
-    private String ext;
-
-    @ApiModelProperty("用户备注")
-    private String memNote;
-
-    @ApiModelProperty("管理员备注")
-    private String adminNote;
-
-    @ApiModelProperty("订单成功备注信息")
-    private String remark;
-
-    @ApiModelProperty("渠道")
-    private String channel;
-
-}

+ 0 - 52
game-module/game-sdk/src/main/java/com/zanxiang/sdk/domain/params/PreOrderParam.java

@@ -1,52 +0,0 @@
-package com.zanxiang.sdk.domain.params;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import javax.validation.constraints.NotNull;
-import java.math.BigDecimal;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class PreOrderParam extends CommonParam {
-
-    @ApiModelProperty("cpId")
-    @NotNull(message = "cpId不可为空")
-    private String cpId;
-
-    @ApiModelProperty("CP订单号")
-    @NotNull(message = "cpOrderId不可为空")
-    private String cpOrderId;
-
-    @ApiModelProperty("角色id")
-    @NotNull(message = "roleId不可为空")
-    private String roleId;
-
-    @ApiModelProperty("货物总价")
-    @NotNull(message = "amount不可为空")
-    private BigDecimal amount;
-
-    @ApiModelProperty("实际支付金额")
-    private BigDecimal realAmount;
-
-    @ApiModelProperty("游戏商品ID")
-    private String productId;
-
-    @ApiModelProperty("游戏商品数量")
-    private Integer productCnt;
-
-    @ApiModelProperty("游戏商品名称")
-    private String productName;
-
-    @ApiModelProperty("CP附加参数")
-    private String ext;
-
-    @ApiModelProperty("渠道")
-    private String channel;
-
-    @ApiModelProperty("支付方式 (1:PC, 2: h5支付, 3: App支付, 4: 小程序支付(微信小游戏), 5: 米大师支付(微信小游戏))")
-    private Integer payDevice;
-}

+ 0 - 51
game-module/game-sdk/src/main/java/com/zanxiang/sdk/domain/params/RegisterMobileParam.java

@@ -1,51 +0,0 @@
-package com.zanxiang.sdk.domain.params;
-
-import com.fasterxml.jackson.annotation.JsonAlias;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-
-/**
- * @author : lingfeng
- * @time : 2022-06-13
- * @description : 手机注册参数
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class RegisterMobileParam extends CommonParam {
-
-    /**
-     * 验证码类型
-     */
-    @ApiModelProperty(notes = "验证码类型")
-    @NotNull(message = "验证码类型不可为空")
-    @JsonAlias("sms-type")
-    private Integer type;
-
-    /**
-     * 手机号
-     */
-    @ApiModelProperty(notes = "手机号")
-    @NotBlank(message = "手机号不可为空")
-    @JsonAlias("sms-mobile")
-    private String mobile;
-
-    /**
-     * 验证码
-     */
-    @ApiModelProperty(notes = "验证码")
-    @NotBlank(message = "验证码不可为空")
-    @JsonAlias("sms-code")
-    private String code;
-
-    /**
-     * 密码
-     */
-    @ApiModelProperty(notes = "密码")
-    @NotBlank(message = "登陆密码不可为空")
-    @JsonAlias("mem-password")
-    private String password;
-}

+ 0 - 33
game-module/game-sdk/src/main/java/com/zanxiang/sdk/domain/params/RegisterPasswordParam.java

@@ -1,33 +0,0 @@
-package com.zanxiang.sdk.domain.params;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import javax.validation.constraints.NotBlank;
-
-/**
- * @author : lingfeng
- * @time : 2022-06-14
- * @description : 用户名密码注册
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class RegisterPasswordParam extends CommonParam {
-
-    private static final long serialVersionUID = 4303428251439433594L;
-
-    /**
-     * 用户名
-     */
-    @ApiModelProperty(notes = "用户名")
-    @NotBlank(message = "注册用户名字不可为空")
-    private String username;
-
-    /**
-     * 密码
-     */
-    @ApiModelProperty(notes = "密码")
-    @NotBlank(message = "注册密码不可为空")
-    private String password;
-}

+ 0 - 22
game-module/game-sdk/src/main/java/com/zanxiang/sdk/domain/params/UserCheckParam.java

@@ -1,22 +0,0 @@
-package com.zanxiang.sdk.domain.params;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import javax.validation.constraints.NotBlank;
-
-/**
- * 用户检测
- *
- * @author : xufeng
- * @time : 2022-07-21
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class UserCheckParam extends CommonParam {
-
-    @ApiModelProperty("签名 sign=md5(gameId&userId&appKey)")
-    @NotBlank(message = "签名不能为空")
-    private String sign;
-}

+ 0 - 24
game-module/game-sdk/src/main/java/com/zanxiang/sdk/domain/params/UserDetailParam.java

@@ -1,24 +0,0 @@
-package com.zanxiang.sdk.domain.params;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import javax.validation.constraints.NotBlank;
-
-/**
- * @author : lingfeng
- * @time : 2022-06-17
- * @description : 用户详情参数
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class UserDetailParam extends CommonParam {
-
-    /**
-     * 用户token
-     */
-    @ApiModelProperty(notes = "token")
-    @NotBlank(message = "注册用户名字不可为空")
-    private String token;
-}

+ 0 - 41
game-module/game-sdk/src/main/java/com/zanxiang/sdk/domain/params/UserOauthlUpdateParam.java

@@ -1,41 +0,0 @@
-package com.zanxiang.sdk.domain.params;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import javax.validation.constraints.NotBlank;
-
-/**
- * @author : lingfeng
- * @time : 2022-06-17
- * @description : 用户详情参数
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class UserOauthlUpdateParam extends CommonParam {
-
-    @ApiModelProperty(notes = "unionId")
-    @NotBlank(message = "唯一id")
-    private String unionId;
-
-
-    @ApiModelProperty(notes = "gender")
-    private String gender;
-
-
-    @ApiModelProperty(notes = "city")
-    private String city;
-
-
-    @ApiModelProperty(notes = "province")
-    private String province;
-
-
-    @ApiModelProperty(notes = "country")
-    private String country;
-
-
-    @ApiModelProperty(notes = "avatarUrl")
-    private String avatarUrl;
-}

+ 0 - 22
game-module/game-sdk/src/main/java/com/zanxiang/sdk/domain/vo/MiniAppConfigVO.java

@@ -1,22 +0,0 @@
-package com.zanxiang.sdk.domain.vo;
-
-import lombok.Data;
-
-/**
- * @author : lingfeng
- * @time : 2022-09-16
- * @description : 小程序参数
- */
-@Data
-public class MiniAppConfigVO {
-
-    /**
-     * 小程appId
-     */
-    private String appId;
-
-    /**
-     * 小程序路径
-     */
-    private String path;
-}

+ 0 - 158
game-module/game-sdk/src/main/java/com/zanxiang/sdk/domain/vo/PlatformOrderVO.java

@@ -1,158 +0,0 @@
-package com.zanxiang.sdk.domain.vo;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-public class PlatformOrderVO {
-    private Long id;
-
-    /**
-     * cpId
-     */
-    private Long cpId;
-
-    /**
-     * CP订单号
-     */
-    private String cpOrderId;
-
-    /**
-     * 充值用户
-     */
-    private Long userId;
-
-    /**
-     * 游戏玩家ID
-     */
-    private Long mgUserId;
-
-    /**
-     * 游戏ID
-     */
-    private Long gameId;
-
-    /**
-     * 货物总价
-     */
-    private BigDecimal amount;
-
-    /**
-     * 实际支付金额
-     */
-    private BigDecimal realAmount;
-
-    /**
-     * 游戏商品ID
-     */
-    private String productId;
-
-    /**
-     * 游戏商品数量
-     */
-    private Integer productCnt;
-
-    /**
-     * 游戏商品名称
-     */
-    private String productName;
-
-    /**
-     * 优惠券抵扣
-     */
-    private BigDecimal couponAmount;
-
-    /**
-     * 平台币使用金额
-     */
-    private BigDecimal ptbAmount;
-
-    /**
-     * 游戏币使用余额
-     */
-    private BigDecimal gmAmount;
-
-    /**
-     * 使用积分
-     */
-    private Integer integral;
-
-    /**
-     * 使用积分抵多少钱
-     */
-    private BigDecimal integralMoney;
-
-    /**
-     * 返利数量 默认为0
-     */
-    private BigDecimal rebateAmount;
-
-    /**
-     * 支付平台返回交易订单号
-     */
-    private Long merchantOrderNo;
-
-    /**
-     * 支付状态,1待支付,2 支付成功,3 已取消
-     */
-    private Integer status;
-
-    /**
-     * 支付方式
-     */
-    private String gamePaywayId;
-
-    /**
-     * 支付时间
-     */
-    private Date payTime;
-
-    /**
-     * 通知次数
-     */
-    private Integer cpNotifyCnt;
-
-    /**
-     * 最近通知时间
-     */
-    private Long lastCpNotifyTime;
-
-    /**
-     * 客服处理: 2正常; 1纠纷
-     */
-    private Integer isHandle;
-
-    /**
-     * 是否已分成  1未分成 2 已分成
-     */
-    private Integer isDistribute;
-
-    /**
-     * CP通知状态,1为待处理,2为成功,3为失败
-     */
-    private Integer cpStatus;
-
-    /**
-     * CP附加参数
-     */
-    private String ext;
-
-    /**
-     * 用户备注
-     */
-    private String memNote;
-
-    /**
-     * 管理员备注
-     */
-    private String adminNote;
-
-    /**
-     * 订单成功备注信息
-     */
-    private String remark;
-
-    /**
-     * 渠道
-     */
-    private Long channel;
-}

+ 19 - 31
game-module/game-sdk/src/main/java/com/zanxiang/sdk/domain/vo/UserVO.java

@@ -1,7 +1,10 @@
 package com.zanxiang.sdk.domain.vo;
 
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 /**
  * @author : lingfeng
@@ -9,53 +12,38 @@ import lombok.Data;
  * @description : 用户信息
  */
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
 public class UserVO {
 
     /**
-     * 用户id
+     * 用户id, 唯一标识
      */
-    @ApiModelProperty(notes = "用户id")
-    private Long id;
+    @ApiModelProperty(notes = "用户id, 唯一标识")
+    private Long userId;
 
     /**
      * 用户名
      */
     @ApiModelProperty(notes = "用户名")
-    private String username;
+    private String userName;
 
     /**
-     * 昵称
+     * 扩展值,可能为空
      */
-    @ApiModelProperty(notes = "昵称")
-    private String nickname;
+    @ApiModelProperty(notes = "扩展值,可能为空")
+    private String extension;
 
     /**
-     * 注册手机号
+     * 是否实名认证,0未实名认证,1成年人,2未成年人
      */
-    @ApiModelProperty(notes = "注册手机号")
-    private String regMobile;
+    @ApiModelProperty(notes = "是否实名认证,0未实名认证,1成年人,2未成年人")
+    private Integer authentication;
 
     /**
-     * 注册邮箱
+     * 是否绑定手机1:已绑定,其他:未绑定
      */
-    @ApiModelProperty(notes = "注册邮箱")
-    private String regEmail;
-
-    /**
-     * 绑定邮箱
-     */
-    @ApiModelProperty(notes = "绑定邮箱")
-    private String email;
-
-    /**
-     * 绑定手机号码
-     */
-    @ApiModelProperty(notes = "绑定手机号码")
-    private String mobile;
-
-    /**
-     * 头像
-     */
-    @ApiModelProperty(notes = "头像")
-    private String avatar;
+    @ApiModelProperty(notes = "是否绑定手机, 0 : 未绑定, 1:已绑定")
+    private Integer bindPhone;
 }

+ 0 - 11
game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/Impl/UserOauthServiceImpl.java

@@ -2,24 +2,16 @@ 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.common.domain.ResultVO;
 import com.zanxiang.common.utils.bean.BeanUtils;
 import com.zanxiang.mybatis.entity.User;
 import com.zanxiang.mybatis.entity.UserOauth;
 import com.zanxiang.mybatis.mapper.UserOauthMapper;
 import com.zanxiang.sdk.domain.dto.UserOauthDTO;
-import com.zanxiang.sdk.domain.params.UserData;
-import com.zanxiang.sdk.domain.params.UserOauthlUpdateParam;
-import com.zanxiang.sdk.domain.vo.UserVO;
 import com.zanxiang.sdk.service.UserOauthService;
-import com.zanxiang.sdk.service.UserService;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Map;
-import java.util.Objects;
-import java.util.concurrent.Semaphore;
 
 /**
  * @author : lingfeng
@@ -30,9 +22,6 @@ import java.util.concurrent.Semaphore;
 @Service
 public class UserOauthServiceImpl extends ServiceImpl<UserOauthMapper, UserOauth> implements UserOauthService {
 
-    @Autowired
-    private UserService userService;
-
     /**
      * 根据openid查询用户授权信息
      *

+ 16 - 22
game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/Impl/UserServiceImpl.java

@@ -11,14 +11,15 @@ import com.zanxiang.mybatis.entity.GameExt;
 import com.zanxiang.mybatis.entity.User;
 import com.zanxiang.mybatis.mapper.UserMapper;
 import com.zanxiang.sdk.domain.dto.UserDTO;
-import com.zanxiang.sdk.domain.dto.UserTokenDTO;
-import com.zanxiang.sdk.domain.params.*;
+import com.zanxiang.sdk.domain.params.BindPhoneParam;
+import com.zanxiang.sdk.domain.params.FindPasswordParam;
+import com.zanxiang.sdk.domain.params.UpdatePasswordParam;
+import com.zanxiang.sdk.domain.params.UserData;
 import com.zanxiang.sdk.domain.vo.CustomerVO;
 import com.zanxiang.sdk.domain.vo.UserVO;
 import com.zanxiang.sdk.service.GameExtService;
 import com.zanxiang.sdk.service.SmsService;
 import com.zanxiang.sdk.service.UserService;
-import com.zanxiang.sdk.service.UserTokenService;
 import com.zanxiang.sdk.util.RegisterUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.logging.log4j.util.Strings;
@@ -38,9 +39,6 @@ import java.util.Objects;
 @Service
 public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements UserService {
 
-    @Autowired
-    private UserTokenService userTokenService;
-
     @Autowired
     private GameExtService gameExtService;
 
@@ -161,25 +159,21 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     /**
      * 获取用户信息
      *
-     * @param userDetailParam : 用户详情参数
-     * @param userData        : userData
-     * @return : 返回用户信息
+     * @param userData : 用户信息
+     * @return : 返回用户详情信息
      */
     @Override
-    public ResultVO<UserVO> getUserDetail(UserDetailParam userDetailParam, UserData userData) {
-        String token = userDetailParam.getToken();
-        Integer deviceType = userData.getDeviceType();
-        UserTokenDTO userTokenDTO = userTokenService.getTokenInfoByTokenDevice(token, deviceType);
-        if (userTokenDTO == null) {
-            return new ResultVO<>(HttpStatusEnum.INVALID_PARAMS);
-        }
+    public UserVO getUserDetail(UserData userData) {
+        Long userId = userData.getUserId();
         //查询用户信息
-        User user = super.getById(userTokenDTO.getUserId());
-        if (user == null) {
-            return new ResultVO<>(HttpStatusEnum.UNKNOWN_ERROR);
-        }
-        UserVO userVO = BeanUtils.copy(user, UserVO.class);
-        return new ResultVO<>(HttpStatusEnum.SUCCESS, userVO);
+        User user = this.getById(userId);
+        //构造用户登录信息
+        return UserVO.builder()
+                .userId(user.getId())
+                .userName(user.getUsername())
+                .authentication(user.getAuthentication())
+                .bindPhone(Strings.isBlank(user.getMobile()) ? 0 : 1)
+                .build();
     }
 
     /**

+ 7 - 5
game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/UserService.java

@@ -4,7 +4,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.zanxiang.common.domain.ResultVO;
 import com.zanxiang.mybatis.entity.User;
 import com.zanxiang.sdk.domain.dto.UserDTO;
-import com.zanxiang.sdk.domain.params.*;
+import com.zanxiang.sdk.domain.params.BindPhoneParam;
+import com.zanxiang.sdk.domain.params.FindPasswordParam;
+import com.zanxiang.sdk.domain.params.UpdatePasswordParam;
+import com.zanxiang.sdk.domain.params.UserData;
 import com.zanxiang.sdk.domain.vo.CustomerVO;
 import com.zanxiang.sdk.domain.vo.UserVO;
 
@@ -44,11 +47,10 @@ public interface UserService extends IService<User> {
     /**
      * 获取用户信息
      *
-     * @param userDetailParam : 用户详情参数
-     * @param userData        : userData
-     * @return : 返回用户信息
+     * @param userData : 用户信息
+     * @return : 返回用户详情信息
      */
-    ResultVO<UserVO> getUserDetail(UserDetailParam userDetailParam, UserData userData);
+    UserVO getUserDetail(UserData userData);
 
     /**
      * 用户获取游戏客服信息