Merge branch 'feature-tob-20230809' of git.quantgroup.cn:head_group/xyqb-user2...

Merge branch 'feature-tob-20230809' of git.quantgroup.cn:head_group/xyqb-user2 into feature-tob-20230809

src/main/java/cn/quantgroup/xyqb/controller/api/v2/OauthApiV2Controller.java

@@ -6,12 +6,14 @@ import cn.quantgroup.xyqb.controller.req.v2.UserInfoConvertReq;
 import cn.quantgroup.xyqb.model.ClientType;
 import cn.quantgroup.xyqb.model.JsonResult;
 import cn.quantgroup.xyqb.model.LoginBean;
+import cn.quantgroup.xyqb.model.ShopMapRsp;
 import cn.quantgroup.xyqb.service.v2.LoginContext;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
 import java.util.Objects;
 
 @RestController
@@ -40,12 +42,13 @@ public class OauthApiV2Controller implements IBaseController {
     }
 
     @PostMapping("/shop-map/user-data-convert")
-    public JsonResult<UserInfoConvertReq> shopMapDataConvert(@RequestBody UserInfoConvertReq req){
+    public JsonResult<List<ShopMapRsp>> shopMapDataConvert(@RequestBody UserInfoConvertReq req){
 
         //手机号是否存在--注册 登录
         //微信是否存在-  若存在，和手机号是否匹配相同
         //头像昵称
-
+        Integer tenantId = getTenantId();
+        req.setTenantId(tenantId);
         return JsonResult.buildSuccessResultGeneric(loginContext.shopMapDataConvert(req));
     }
 }

src/main/java/cn/quantgroup/xyqb/controller/api/v2/UserApiV2Controller.java

@@ -86,7 +86,7 @@ public class UserApiV2Controller implements IBaseController {
 
         if (StringUtils.isNotEmpty(userInfoReq.getAppId()) && StringUtils.isNotEmpty(userInfoReq.getOpenId())) {
             WechatUserInfo wechatUserInfoFromDb = wechatService.findWechatUserInfoFromDb(userInfoReq.getOpenId(), userInfoReq.getAppId(), tenantId);
-            if (wechatUserInfo == null || wechatUserInfoFromDb.getUserId() == null) {
+            if (wechatUserInfo == null || wechatUserInfoFromDb == null ||  wechatUserInfoFromDb.getUserId() == null) {
                 //throw new BizException(BizExceptionEnum.UN_EXIT_USER);
                 return JsonResult.buildErrorResultWhithCode(BizExceptionEnum.UN_EXIT_USER.getMsg(),BizExceptionEnum.UN_EXIT_USER.getBusinessCode());
             }

src/main/java/cn/quantgroup/xyqb/model/ShopMapRsp.java

+package cn.quantgroup.xyqb.model;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class ShopMapRsp implements Serializable {
+    private Long id;
+    private String phoneNo;
+    private String uuid;
+}

src/main/java/cn/quantgroup/xyqb/service/v2/LoginContext.java

@@ -11,6 +11,7 @@ import cn.quantgroup.xyqb.exception.BizException;
 import cn.quantgroup.xyqb.exception.BizExceptionEnum;
 import cn.quantgroup.xyqb.model.JsonResult;
 import cn.quantgroup.xyqb.model.LoginBean;
+import cn.quantgroup.xyqb.model.ShopMapRsp;
 import cn.quantgroup.xyqb.model.UserInfo;
 import cn.quantgroup.xyqb.model.session.SessionStruct;
 import cn.quantgroup.xyqb.model.v2.login.BaseLoginParam;
@@ -28,11 +29,7 @@ import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.RequestBody;
 
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -116,7 +113,7 @@ public class LoginContext {
     /**
      * 消费地图历史数据清洗转换
      */
-    public UserInfoConvertReq shopMapDataConvert(UserInfoConvertReq req){
+    public List<ShopMapRsp> shopMapDataConvert(UserInfoConvertReq req){
         List<UserInfoConvertReq.UserConvertInfo> userConvertInfoList = req.getUserConvertInfoList();
         if (CollectionUtils.isEmpty(userConvertInfoList) || userConvertInfoList.get(0).getUser() == null) {
             throw new BizException(BizExceptionEnum.ERROR_PARAM);
@@ -188,9 +185,16 @@ public class LoginContext {
         if (CollectionUtils.isNotEmpty(entities)) {
             userInfoRepository.save(entities);
         }
+        List<ShopMapRsp> shopMapRsps = new ArrayList<>();
+        for (User user : registerUserList) {
+            ShopMapRsp shopMapRsp = new ShopMapRsp();
+            shopMapRsp.setId(user.getId());
+            shopMapRsp.setPhoneNo(user.getPhoneNo());
+            shopMapRsp.setUuid(user.getUuid());
+            shopMapRsps.add(shopMapRsp);
+        }
 
-
-        return req;
+        return shopMapRsps;
 
         //手机号是否存在--注册 登录
         //微信是否存在-  若存在，和手机号是否匹配相同