rpc

src/main/java/cn/quantgroup/xyqb/controller/external/motan/MotanUserServiceImpl.java

@@ -5,7 +5,7 @@ import cn.quantgroup.service.*;
 import cn.quantgroup.xyqb.Constants;
 import cn.quantgroup.xyqb.controller.IBaseController;
 import cn.quantgroup.xyqb.entity.*;
-import cn.quantgroup.xyqb.entity.enumerate.Relation;
+import cn.quantgroup.xyqb.entity.enumerate.*;
 import cn.quantgroup.xyqb.model.*;
 import cn.quantgroup.xyqb.model.session.*;
 import cn.quantgroup.xyqb.repository.IUserRepository;
@@ -14,6 +14,7 @@ import cn.quantgroup.xyqb.service.merchant.IMerchantService;
 import cn.quantgroup.xyqb.service.session.ISessionService;
 import cn.quantgroup.xyqb.service.sms.ISmsService;
 import cn.quantgroup.xyqb.service.user.*;
+import cn.quantgroup.xyqb.service.wechat.IWechatService;
 import cn.quantgroup.xyqb.util.IPUtil;
 import cn.quantgroup.xyqb.util.PasswordUtil;
 import cn.quantgroup.xyqb.util.ValidationUtil;
@@ -68,6 +69,10 @@ public class MotanUserServiceImpl implements UserMotanService, IBaseController{
     private IContactService contactService;
     @Autowired
     private IAddressService addressService;
+    @Autowired
+    private IUserExtInfoService userExtInfoService;
+    @Autowired
+    private IWechatService wechatService;
     private final static Random random = new Random();
 
     @Override
@@ -338,22 +343,80 @@ public class MotanUserServiceImpl implements UserMotanService, IBaseController{
         if(null == xUserExtInfo.getUserId() || 0L == xUserExtInfo.getUserId()) {
             return userSysResult;
         }
-        return null;
+        if (null == xUserExtInfo.getUserId()) {
+            userSysResult.setMsg("用户ID不能为空");
+            return userSysResult;
+        }
+        UserExtInfo info = userExtInfoService.findByUserId(xUserExtInfo.getUserId());
+        if (info == null) {
+            Timestamp now = new Timestamp(System.currentTimeMillis());
+            info = new UserExtInfo();
+            info.setUserId(xUserExtInfo.getUserId());
+            info.setCreatedAt(now);
+            info.setUpdateAt(now);
+        }
+        if (xUserExtInfo.getIncomeEnum() != null) {
+            info.setIncomeEnum(IncomeEnum.valueOf(xUserExtInfo.getIncomeEnum().name()));
+        }
+        if (xUserExtInfo.getIncomeRangeEnum() != null) {
+            info.setIncomeRangeEnum(IncomeRangeEnum.valueOf(xUserExtInfo.getIncomeRangeEnum().name()));
+        }
+        if (xUserExtInfo.getOccupationEnum() != null) {
+            info.setOccupationEnum(OccupationEnum.valueOf(xUserExtInfo.getOccupationEnum().name()));
+        }
+        if (xUserExtInfo.getEducationEnum() != null) {
+            info.setEducationEnum(EducationEnum.valueOf(xUserExtInfo.getEducationEnum().name()));
+        }
+        if (xUserExtInfo.getHasCar() != null) {
+            info.setHasCar(xUserExtInfo.getHasCar());
+        }
+        if (xUserExtInfo.getHasCreditCard() != null) {
+            info.setHasCreditCard(xUserExtInfo.getHasCreditCard());
+        }
+        if (xUserExtInfo.getHasHouse() != null) {
+            info.setHasHouse(xUserExtInfo.getHasHouse());
+        }
+        if (xUserExtInfo.getMarryStatus() != null) {
+            info.setMarryStatus(MaritalStatus.valueOf(xUserExtInfo.getMarryStatus().name()));
+        }
+        info = userExtInfoService.save(info);
+        XUserExtInfo userExtInfo = convertObject(JSON.toJSONString(info), new TypeReference<XUserExtInfo>() {});
+        return returnValue(userExtInfo, "");
     }
 
     @Override
-    public UserSysResult<String> queryOpenIdByXyqbUserId(Long aLong) {
-        return null;
+    public UserSysResult<String> queryOpenIdByXyqbUserId(Long userId) {
+        UserSysResult<String> userSysResult = returnValue(null, null);
+        if(userId == null) {
+            userSysResult.setMsg("userId不能为空");
+            return userSysResult;
+        }
+        WechatUserInfo wechatUserInfo = wechatService.queryOpenIdByUserId(userId);
+        if(wechatUserInfo == null) {
+            return userSysResult;
+        }
+        return returnValue(wechatUserInfo.getOpenId(), "success");
     }
 
     @Override
-    public UserSysResult<Boolean> disableUser(Long aLong) {
+    public UserSysResult<Boolean> disableUser(Long userId) {
         return null;
     }
 
     @Override
-    public UserSysResult<String> queryOpenIdByPhoneNo(String s) {
-        return null;
+    public UserSysResult<String> queryOpenIdByPhoneNo(String phoneNo) {
+        UserSysResult<String> userSysResult = returnValue(null, null);
+        if(StringUtils.isBlank(phoneNo)) {
+            userSysResult.setMsg("手机号错误");
+            return userSysResult;
+        }
+        if(!ValidationUtil.validatePhoneNo(phoneNo)) {
+            userSysResult.setMsg("手机号格式错误");
+            return userSysResult;
+        }
+        WechatUserInfo wechatUserInfo = wechatService.findWechatUserInfoByPhoneNo(phoneNo);
+        String openId = null == wechatUserInfo ? null : wechatUserInfo.getOpenId();
+        return returnValue(openId, null);
     }
 
     @Override