Merge remote-tracking branch 'origin/dev_thirdplatform' into dev_thirdplatform

epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java

@@ -283,13 +283,16 @@ public class PublicUserLoginServiceImpl implements PublicUserLoginService {
     public UserTokenResultDTO register(RegisterFormDTO formDTO) {
         //1.调用epmet-third服务，完成信息注册
         String data = HttpClientManager.getInstance().sendPostByJSON(AuthHttpUrlConstant.REGISTER_URL, JSON.toJSONString(formDTO)).getData();
+        logger.info("data数据为："+data);
         JSONObject toResult = JSON.parseObject(data);
         Result result = ConvertUtils.mapToEntity(toResult, Result.class);
+        logger.info("转换的result结果为："+result);
         if (!result.success()) {
             logger.error(String.format("调用epmet_third服务初始化用户信息失败,数据来源[%s],手机号[%s],userId:[%S]", formDTO.getSource(), formDTO.getPhone(), formDTO.getUserId()));
             throw new RenException(result.getCode());
         }
         Object RegisterResult = result.getData();
+        logger.info("getData()数据为："+RegisterResult);
         JSONObject jsonObject = JSON.parseObject(RegisterResult.toString());
         RegisterResultDTO resultDTO = ConvertUtils.mapToEntity(jsonObject, RegisterResultDTO.class);
 

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java

@@ -182,6 +182,7 @@ public class PaCustomerServiceImpl extends BaseServiceImpl<PaCustomerDao, PaCust
             userEntity.setPhone(formDTO.getPhone());
             userEntity.setRealName(formDTO.getSurName());
             userEntity.setGender(formDTO.getGender().toString());
+            userEntity.setSource(formDTO.getSource());
             if (paUserDao.insert(userEntity) < NumConstant.ONE) {
                 throw new RenException(PaConstant.SAVE_USER_EXCEPTION);
             }