fix c端用户信息展示

netflix-dao/src/main/java/com/cyksj/mapper/UserMapper.java

@@ -47,4 +47,7 @@ public interface UserMapper extends BaseMapper<User> {
 
     @Update("update user set balance = balance - #{subBalance} where id = #{userId} and balance = #{userBalance}")
     Integer deductUserBalance(@Param("userId") Long userId, @Param("userBalance") BigDecimal userBalance, @Param("subBalance") BigDecimal subBalance);
+
+    @Select("select id from user where show_id = #{showId} limit 1")
+    Long getUserIdByShowId(String showId);
 }

netflix-dao/src/main/java/com/cyksj/model/dto/UserWhoami.java

@@ -15,8 +15,7 @@ import java.io.Serializable;
 @Setter
 @Accessors(chain = true)
 public class UserWhoami implements Serializable {
-
-    private Long id;
+    private String showId;
 
     /**
      * 名称

netflix-dao/src/main/java/com/cyksj/model/entity/User.java

@@ -28,6 +28,9 @@ public class User extends BaseEntity implements Serializable{
     private String nickname ;
     /** 头像;头像 */
     private String headimgurl ;
+
+    private String showId;
+
     /** 开放平台唯一id;开放平台唯一id */
     private String unionid ;
 

netflix-dao/src/main/java/com/cyksj/model/manage/views/UserView.java

@@ -67,6 +67,9 @@ public class UserView {
     @DbField("case when u.login_phone != '' then 'phone' when u.email != '' then 'email' when u.open_id != '' then 'wechat' else 'wechat' end")
     private String register;
 
+    @DbField("u.show_id")
+    private String showId;
+
     /**
      * 登录注册手机号
      */

netflix-dao/src/main/java/com/cyksj/model/request/UserReq.java

@@ -3,9 +3,6 @@ package com.cyksj.model.request;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-
 /*
  *项目名: netflix
  *文件名: UserReq
@@ -15,9 +12,12 @@ import javax.validation.constraints.NotNull;
 @Getter
 @Setter
 public class UserReq {
-	@NotNull(message = "性别不能为空")
 	private Integer sex;
 
-	@NotEmpty(message = "头像不能为空")
 	private String headImg;
+
+	/**
+	 * 用户昵称
+	 */
+	private String nickname;
 }

netflix-dao/src/main/java/com/cyksj/model/response/LoginPhoneRep.java

@@ -18,7 +18,7 @@ import lombok.Setter;
 public class LoginPhoneRep {
 	private String saToken;
 
-	private Long uid;
+	private String showId;
 
 	private String nickname;
 

netflix-service/src/main/java/com/cyksj/service/user/UserService.java

@@ -31,4 +31,14 @@ public interface UserService extends IService<User> {
     List<Long> getRelationUserIdList(Long userId, User selectUser);
 
 	List<Long> getUserIdsByNickname(String nickname);
+
+    /**
+     * 设置用户展示id
+     */
+	String getUserShowId(Long userId);
+
+	/**
+	 * 根据showId 获取用户id
+	 */
+	Long getUserIdByShowId(String showId);
 }

netflix-service/src/main/java/com/cyksj/service/user/impl/UserServiceImpl.java

@@ -1,6 +1,7 @@
 package com.cyksj.service.user.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -129,13 +130,15 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 
     @Override
     public UserWhoami whoami(long userId) {
-        User user = this.getById(userId);
-        Assert.notNull(user,"业务处理失败,请联系客服");
-        UserWhoami userWhoami = new UserWhoami();
+	    User user = this.getById(userId);
+	    Assert.notNull(user, "业务处理失败,请联系客服");
+	    UserWhoami userWhoami = new UserWhoami();
+	    if (StrUtil.isEmpty(user.getShowId())) {
+		    user.setShowId(getUserShowId(userId));
+	    }
+	    BeanUtil.copyProperties(user, userWhoami);
 
-        BeanUtil.copyProperties(user, userWhoami);
-
-        return userWhoami;
+	    return userWhoami;
     }
 
     @Override
@@ -246,4 +249,23 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 	public List<Long> getUserIdsByNickname(String nickname) {
 		return userMapper.selectListByNickname(nickname);
 	}
+
+	@Override
+	public String getUserShowId(Long userId) {
+		Integer update = 0;
+		String showId = null;
+		while (update != 1) {
+			showId = RandomUtil.randomString(6);
+			update = userMapper.update(null, Wrappers.lambdaUpdate(User.class)
+					.set(User::getShowId, showId)
+					.eq(User::getId, userId));
+		}
+		return showId;
+	}
+
+	@Override
+	public Long getUserIdByShowId(String showId) {
+		return userMapper.getUserIdByShowId(showId);
+	}
+
 }

netflix-web/src/main/java/com/cyksj/web/controller/manage/CmsOrderController.java

@@ -89,7 +89,7 @@ public class CmsOrderController {
 
 	@GetMapping("/get")
 	@SaCheckPermission("order:view")
-	public Result<SearchResult<OrderDonBackView>> get(Long channelId, String account) {
+	public Result<SearchResult<OrderDonBackView>> get(Long channelId, String account, String showId) {
 		MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap());
 		if (channelId != null) {
 			List<Long> popularizeIds = channelPopularizeMapper.getPopularizeIdByChannelId(channelId);
@@ -104,6 +104,9 @@ public class CmsOrderController {
 				builder.field(OrderDonBackView::getRelationId).op(Operator.IsNull);
 			}
 		}
+		if (StrUtil.isNotBlank(showId)) {
+			builder.field(OrderDonBackView::getUserId, userService.getUserIdByShowId(showId));
+		}
 		SearchResult<OrderDonBackView> search = beanSearcher.search(OrderDonBackView.class, builder.build());
 		search.getDataList().forEach(data -> {
 			if (data.getPopularizeId() != null) {

netflix-web/src/main/java/com/cyksj/web/controller/manage/account/CmsAccountController.java

@@ -100,12 +100,15 @@ public class CmsAccountController {
 
 	@GetMapping("/get")
 	@SaCheckPermission("account:view")
-	public Result<SearchResult<AccountView>> get(Long userId, String nickName, String submitAccount, String expiryStartTime, String expiryEndTime, Boolean expiredAll, Boolean existsExpired, Boolean existsExpiredToday) {
+	public Result<SearchResult<AccountView>> get(Long userId, String showId, String nickName, String submitAccount, String expiryStartTime, String expiryEndTime, Boolean expiredAll, Boolean existsExpired, Boolean existsExpiredToday) {
 		MapBuilder mapBuilder = MapUtils.flatBuilder(request.getParameterMap());
 		if (StrUtil.isNotEmpty(expiryStartTime) || StrUtil.isNotEmpty(expiryEndTime)) {
 			mapBuilder.field(AccountView::getExpiryTime, expiryStartTime, expiryEndTime)
 					.op(Operator.Between);
 		}
+		if (StrUtil.isNotEmpty(showId)) {
+			userId = userMapper.getUserIdByShowId(showId);
+		}
 
 		if (userId != null || StringUtils.isNotBlank(nickName) || StringUtils.isNotBlank(submitAccount)) {
 			List<Long> accountIds = homeGroupMapper.getAccountIdsByUserIdOrNickNameOrSubmitAccount(userId, nickName, submitAccount);

netflix-web/src/main/java/com/cyksj/web/controller/manage/distribute/DistributeController.java

@@ -147,13 +147,16 @@ public class DistributeController {
 	 * 固定推广者列表
 	 */
 	@GetMapping
-	public Result<SearchResult<UserDistributeViews>> distributeList(String nickname, String startTime, String endTime) {
+	public Result<SearchResult<UserDistributeViews>> distributeList(String nickname, String showId, String startTime, String endTime) {
 		long adminId = StpUtil.getLoginIdAsLong();
 		MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap());
 		//是否是商务人员
 		if (userBusinessRateService.isBusiness(adminId)) {
 			builder.field(UserDistributeViews::getBusinessId, adminId);
 		}
+		if (StrUtil.isNotBlank(showId)) {
+			builder.field(UserDistributeViews::getUserId, userMapper.getUserIdByShowId(showId));
+		}
 		if (StrUtil.isNotBlank(nickname)) {
 			List<Long> userIds = userMapper.selectListByNickname(nickname);
 			builder.field(UserDistributeViews::getUserId, userIds).op(Operator.InList);

netflix-web/src/main/java/com/cyksj/web/controller/manage/group/CmsGroupController.java

@@ -16,6 +16,7 @@ import com.cyksj.dto.Result;
 import com.cyksj.enums.BusinessType;
 import com.cyksj.enums.GatewayResponse;
 import com.cyksj.mapper.GroupsRelationMapper;
+import com.cyksj.mapper.UserMapper;
 import com.cyksj.model.entity.Account;
 import com.cyksj.model.entity.GroupsTrips;
 import com.cyksj.model.entity.GroupsTripsAccountReplaceRecord;
@@ -61,10 +62,15 @@ public class CmsGroupController {
 
     private final GroupsRelationMapper relationMapper;
 
+    private final UserMapper userMapper;
+
     @GetMapping("/get")
     @SaCheckPermission("group:view")
-    public Result<SearchResult<GroupsTrips>> get(String account, Long userId, String nickName, String submitAccount, Boolean isEmpty) {
+    public Result<SearchResult<GroupsTrips>> get(String account, Long userId, String showId, String nickName, String submitAccount, Boolean isEmpty) {
         MapBuilder mapBuilder = MapUtils.flatBuilder(request.getParameterMap());
+        if (StrUtil.isNotBlank(showId)) {
+            userId = userMapper.getUserIdByShowId(showId);
+        }
         if (userId != null || StringUtils.isNotBlank(nickName) || StringUtils.isNotBlank(submitAccount)) {
             List<Long> ids = relationMapper.getAccountIdsByUserIdOrNickNameOrSubmitAccount(userId, nickName, submitAccount);
             if (ids.isEmpty()) {

netflix-web/src/main/java/com/cyksj/web/controller/user/AuthorizationController.java

@@ -96,39 +96,41 @@ public class AuthorizationController {
     @GetMapping(value = "/weChat")
     public void base(String url, String dsCode, Long sharedId, Integer dsType, Long popularizeId, String authType, HttpServletResponse response) throws Exception {
 
-        log.info("微信授权转跳. url: {},authType:{}",url,authType);
+        log.info("微信授权转跳. url: {},authType:{}", url, authType);
 
         // 无论是否为老用户 均转跳到授权页面
         // 若授权过 则无需再次授权 直接回调 /user/wechat/redirect
         // 新用户同意授权后 也会回调 /user/wechat/redirect
 
         Long mappingId = SEQUENCE.nextId();
-        redisService.set(mappingId.toString(),url,60*60*24L);
+        redisService.set(mappingId.toString(), url, 60 * 60 * 24L);
         if (StrUtil.isNotBlank(dsCode)) {
             dsCode = dsCode.trim();
         }
         AuthRedirect redirect = new AuthRedirect().setMappingId(mappingId).setSharedId(sharedId).setDsType(dsType).setPid(popularizeId).setDsCode(dsCode);
         String state = Codec.DoBase64.custom().setData(Jsons.toJson(redirect)).encodeAsText();
 
-        response.sendRedirect(authorizationService.createUrl(state,authType));
+        response.sendRedirect(authorizationService.createUrl(state, authType));
 
     }
 
 
     /**
      * 全量授权
+     *
      * @author chan
      * @date 2021-10-11 上午11:57
      */
     @GetMapping(value = "/weChat/baseRedirect")
     public void redirect(String code, String state, HttpServletResponse response) throws Exception {
-        AuthToken token = weChatService.getAuthToken(code,weChatConfig.getAppid());
+        AuthToken token = weChatService.getAuthToken(code, weChatConfig.getAppid());
 
         baseRedirect(token, state, User.RegisterEnv.wx, response);
     }
 
     /**
      * 静默授权
+     *
      * @author chan
      * @date 2021-10-11 上午11:58
      */
@@ -140,18 +142,18 @@ public class AuthorizationController {
         String json = Codec.DoBase64.custom().setData(state).decodeAsText();
         AuthRedirect re = Jsons.parseObject(json, AuthRedirect.class);
 
-        AuthToken token = weChatService.getAuthToken(code,weChatConfig.getAppid());
+        AuthToken token = weChatService.getAuthToken(code, weChatConfig.getAppid());
 
         //  查询用户期望转跳的url
         String url = redisService.getStr(re.getMappingId().toString());
         String data = Codec.DoBase64.custom().setData(token.getOpenid()).encodeAsText();
 
-        Cookie cookie = new Cookie("openKey",data);
+        Cookie cookie = new Cookie("openKey", data);
         cookie.setMaxAge(31536000);
         cookie.setPath("/");
         response.addCookie(cookie);
 
-        log.info("微信授权转跳. url: {}",url);
+        log.info("微信授权转跳. url: {}", url);
         response.sendRedirect(url);
 
     }
@@ -160,11 +162,11 @@ public class AuthorizationController {
      * 微信js-sdk 权限验证
      */
     @RequestMapping(value = "/jsTicket", method = RequestMethod.GET)
-    public Result<JsSdkTicket> ticket(String appId, String url) throws Exception{
+    public Result<JsSdkTicket> ticket(String appId, String url) throws Exception {
         if (StringUtils.isBlank(url)) {
             throw BusinessRuntimeException.getInstance("请输入授权网址.");
         }
-        return GatewayResponse.SUCCESS.newBuilder().toResult(authorizationService.getJsTicket(Optional.ofNullable(appId).orElse(weChatConfig.getAppid()),url));
+        return GatewayResponse.SUCCESS.newBuilder().toResult(authorizationService.getJsTicket(Optional.ofNullable(appId).orElse(weChatConfig.getAppid()), url));
 
     }
 
@@ -269,10 +271,12 @@ public class AuthorizationController {
         }
         StpUserUtil.login(userId);
         String token = StpUserUtil.getTokenValue();
-
+        if (StrUtil.isEmpty(user.getShowId())) {
+            user.setShowId(userService.getUserShowId(userId));
+        }
         JSONObject jsonObject = new JSONObject();
         jsonObject.putOpt("saToken", token);
-        jsonObject.putOpt("uid", userId);
+        jsonObject.putOpt("showId", user.getShowId());
         jsonObject.putOpt("nickname", user.getNickname());
         jsonObject.putOpt("img", user.getHeadimgurl());
 
@@ -326,7 +330,7 @@ public class AuthorizationController {
         } else phoneCodeMapper.updateById(phoneCode);
         if (!isFree) {
             SmsUtil.sendTencent(phone, code);
-        }else {
+        } else {
             // 发送短信
             SmsUtil.sendLuoKey2Msg(phone, String.format("尊敬的用户，您的验证码为%s，此验证码仅用于银河录像。【银河录像局】", code));
         }
@@ -383,7 +387,7 @@ public class AuthorizationController {
                 throw BusinessRuntimeException.getInstance("手机验证码错误,请重新输入");
             }
             wrapper.eq(User::getLoginPhone, loginReq.getPhone());
-        }else if (loginReq.getType() == 2){
+        } else if (loginReq.getType() == 2) {
             if (StrUtil.isEmpty(loginReq.getEmail())) {
                 throw BusinessRuntimeException.getInstance("邮箱不能为空");
             }
@@ -396,7 +400,7 @@ public class AuthorizationController {
             }
             wrapper.eq(User::getEmail, loginReq.getEmail());
             redisService.del(RedisService.key.EMAIL_CODE_KEY.getNameFormat(loginReq.getEmail()));
-        }else {
+        } else {
             throw BusinessRuntimeException.getInstance("系统异常,请刷新页面重新操作");
         }
         //保存用户信息
@@ -442,7 +446,10 @@ public class AuthorizationController {
         }
         //写回登陆信息
         StpUserUtil.login(user.getId());
-        LoginPhoneRep loginPhoneRep = new LoginPhoneRep(StpUserUtil.getTokenValue(), user.getId(), user.getNickname(), user.getHeadimgurl());
+        if (StrUtil.isEmpty(user.getShowId())) {
+            user.setShowId(userService.getUserShowId(user.getId()));
+        }
+        LoginPhoneRep loginPhoneRep = new LoginPhoneRep(StpUserUtil.getTokenValue(), user.getShowId(), user.getNickname(), user.getHeadimgurl());
         return GatewayResponse.SUCCESS.newBuilder().toResult(loginPhoneRep);
     }
 
@@ -468,7 +475,10 @@ public class AuthorizationController {
         cookie.setPath("/");
         response.addCookie(cookie);
         JSONObject jsonObject = new JSONObject();
-        jsonObject.putOpt("uid", user.getId());
+        if (StrUtil.isEmpty(user.getShowId())) {
+            user.setShowId(userService.getUserShowId(user.getId()));
+        }
+        jsonObject.putOpt("showId", user.getShowId());
         jsonObject.putOpt("nickName", user.getNickname());
 
         Cookie userInfo = new Cookie("info", Base64.encode(jsonObject.toString()));

netflix-web/src/main/java/com/cyksj/web/controller/user/UserController.java

@@ -1,6 +1,7 @@
 package com.cyksj.web.controller.user;
 
 import cn.hutool.core.date.DateTime;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.cyksj.common.annotation.NoSubmit;
 import com.cyksj.common.exception.BusinessRuntimeException;
@@ -227,13 +228,26 @@ public class UserController {
      * 用户修改头像
      */
     @PutMapping("/put/headImg")
-    public Result<String> updateHeadImg(@RequestBody @Validated UserReq request) {
+    public Result<String> updateHeadImg(@RequestBody UserReq request) {
         long userId = StpUserUtil.getLoginIdAsLong();
         User user = userService.getById(userId);
         if (user == null) throw BusinessRuntimeException.getGatewayApiCode(GatewayApiCode.CMS_TOKEN_VALID);
-        user.setSex(request.getSex());
-        user.setHeadimgurl(request.getHeadImg());
-        userService.updateById(user);
+        Boolean isFlag = false;
+        if (StrUtil.isNotBlank(request.getNickname())) {
+            user.setNickname(request.getNickname());
+            isFlag = true;
+        }
+        if (request.getSex() != null) {
+            user.setSex(request.getSex());
+            isFlag = true;
+        }
+        if (StrUtil.isNotBlank(request.getHeadImg())) {
+            user.setHeadimgurl(request.getHeadImg());
+            isFlag = true;
+        }
+        if (isFlag) {
+            userService.updateById(user);
+        }
         return GatewayResponse.SUCCESS.newBuilder().toResult();
     }