合并用户信息

src/main/java/cn/quantgroup/customer/rest/vo/card/CardResult.java

 package cn.quantgroup.customer.rest.vo.card;
 
+import cn.quantgroup.customer.model.xyqbuser.UserBasicInfo;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -19,5 +20,5 @@ import java.util.List;
 @NoArgsConstructor
 public class CardResult {
     private List<XyqbCardsInfo> bindCardInfo;
-    // TODO 还有user信息
+    private UserBasicInfo userInfo;
 }

src/main/java/cn/quantgroup/customer/service/impl/CardServiceImpl.java

 package cn.quantgroup.customer.service.impl;
 
 import cn.quantgroup.customer.enums.ErrorCodeEnum;
+import cn.quantgroup.customer.model.xyqbuser.UserBasicInfo;
 import cn.quantgroup.customer.rest.param.card.ModifyCardsQuery;
 import cn.quantgroup.customer.rest.param.card.ModifyReservePhone;
 import cn.quantgroup.customer.rest.param.card.UnBindCardModel;
+import cn.quantgroup.customer.rest.param.user.UserCombinationParam;
 import cn.quantgroup.customer.rest.vo.JsonResult;
 import cn.quantgroup.customer.rest.vo.card.CardResult;
 import cn.quantgroup.customer.rest.vo.card.XyqbCardRelationResult;
 import cn.quantgroup.customer.rest.vo.card.XyqbCardsResult;
 import cn.quantgroup.customer.service.ICardService;
+import cn.quantgroup.customer.service.IUserService;
 import cn.quantgroup.customer.service.IXyqbService;
 import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.databind.JsonNode;
+import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,6 +34,8 @@ import java.util.Objects;
 public class CardServiceImpl implements ICardService {
     @Autowired
     private IXyqbService xyqbService;
+    @Autowired
+    private IUserService userService;
 
 
     @Override
@@ -46,9 +52,20 @@ public class CardServiceImpl implements ICardService {
         }
 
         Long userId = cardsQuery.getUserId();
+        CardResult cardResult = new CardResult();
         if (Objects.isNull(userId)) {
-            // TODO 需要根据手机号查询用户userId
-            userId = null;
+            UserCombinationParam userCombinationParam = new UserCombinationParam();
+            userCombinationParam.setPhoneNo(cardsQuery.getPhoneNo());
+            JsonResult userJsonResult = userService.findUserInfo(userCombinationParam);
+            if(Objects.isNull(userJsonResult)
+                    || !userJsonResult.isSuccess()){
+                log.error("根据手机号查不到用户信息");
+                return JsonResult.buildErrorStateResult("根据手机号查不到用户信息", ErrorCodeEnum.PARAM_ERROR.getCode());
+            }
+
+            UserBasicInfo userbasicinfo = (UserBasicInfo) userJsonResult.getData();
+            cardResult.setUserInfo(userbasicinfo);
+            userId = userbasicinfo.getUserId();
         }
 
         //发起xyqb查询
@@ -71,9 +88,8 @@ public class CardServiceImpl implements ICardService {
             return JsonResult.buildErrorStateResult(ErrorCodeEnum.RETURN_ERROR.getMessage(), ErrorCodeEnum.RETURN_ERROR.getCode());
         }
 
-        CardResult cardResult = new CardResult();
-        cardResult.setBindCardInfo(xyqbCardsResult.getData());
 
+        cardResult.setBindCardInfo(xyqbCardsResult.getData());
         log.info("[查询绑卡信息]，返回 cardResult={}", cardResult);
         return JsonResult.buildSuccessResult("处理成功", cardResult);
     }