Merge remote-tracking branch 'origin/test'

张志伟
2 parents 3d0baec2 f0f84c31
Showing 3 changed files with 18 additions and 119 deletions
fw-hermes-rpc/src/main/java/cn/fw/hermes/rpc/member/MemberRpcService.java
fw-hermes-rpc/src/main/java/cn/fw/hermes/rpc/member/dto/MemberUserDTO.java
pom.xml
@@ -5,26 +5,17 @@ import cn.fw.data.base.domain.common.Message;
 import cn.fw.hermes.rpc.member.dto.MemberUserDTO;
 import cn.fw.member.sdk.api.FunctionApi;
 import cn.fw.member.sdk.api.MemberApi;
-import cn.fw.member.sdk.vo.BatchUserParam;
+import cn.fw.member.sdk.vo.MemberInfoVo;
 import cn.fw.member.sdk.vo.MobileLocation;
-import cn.fw.member.sdk.vo.UserBaseInfoVO;
-import cn.fw.member.sdk.vo.UserRegistryVO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
  
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
 import java.util.Objects;
  
-import static org.apache.commons.lang3.Validate.isTrue;
-import static org.apache.commons.lang3.Validate.notNull;
-
 /**
  * 会员服务
  *
@@ -60,12 +51,12 @@ public class MemberRpcService {
             return null;
         }
         try {
-            final Message<UserBaseInfoVO> msg = memberApi.queryUserByuserId(userId);
+            final Message<MemberInfoVo> msg = memberApi.getMemberById(userId);
             if (!msg.isSuccess()) {
                 log.warn("调用Member[根据会员ID[{}]获取会员信息]系统失败, 原因：{}", userId, msg.getResult());
                 return null;
             }
-            final UserBaseInfoVO user = msg.getData();
+            final MemberInfoVo user = msg.getData();
             if (user != null) {
                 final MemberUserDTO userDTO = new MemberUserDTO();
                 BeanUtils.copyProperties(user, userDTO);
@@ -78,86 +69,6 @@ public class MemberRpcService {
     }
  
     /**
-     * 根据会员ID集合获取会员列表
-     *
-     * @param userIds 会员ID集合
-     * @return 会员列表
-     */
-    public List<MemberUserDTO> users(final List<Long> userIds) {
-        if (CollectionUtils.isEmpty(userIds)) {
-            return Collections.emptyList();
-        }
-        try {
-            final BatchUserParam param = new BatchUserParam();
-            param.setUserIdList(userIds);
-            final Message<List<UserBaseInfoVO>> msg = memberApi.batchUserByUserId(param);
-            if (!msg.isSuccess()) {
-                log.warn("调用Member[根据会员ID集合[{}]获取会员列表]系统失败, 原因：{}", userIds, msg.getResult());
-                return Collections.emptyList();
-            }
-            final List<UserBaseInfoVO> users = msg.getData();
-            if (!CollectionUtils.isEmpty(users)) {
-                final List<MemberUserDTO> members = new ArrayList<>();
-                users.forEach(item -> {
-                    final MemberUserDTO userDTO = new MemberUserDTO();
-                    BeanUtils.copyProperties(item, userDTO);
-                    members.add(userDTO);
-                });
-                return members;
-            }
-        } catch (Exception e) {
-            log.error("调用Member[根据会员ID集合[{}]获取会员列表]系统失败", userIds, e);
-        }
-        return Collections.emptyList();
-    }
-
-    /**
-     * 根据手机号查询会员信息
-     *
-     * @param mobile 手机号
-     * @return 会员信息
-     */
-    public MemberUserDTO queryByMobile(final String mobile) {
-        if (StringUtils.isBlank(mobile)) {
-            return null;
-        }
-        try {
-            final Message<UserBaseInfoVO> msg = memberApi.queryUserByMobile(mobile);
-            isTrue(msg.isSuccess(), String.format("调用Member系统失败: [根据会员手机号[%s]获取会员信息]", mobile));
-            final UserBaseInfoVO user = msg.getData();
-            if (Objects.isNull(user)) {
-                return null;
-            }
-            final MemberUserDTO userDTO = new MemberUserDTO();
-            BeanUtils.copyProperties(user, userDTO);
-            return userDTO;
-        } catch (Exception e) {
-            log.error("调用Member系统根据会员手机号[{}]获取会员信息失败", mobile, e);
-        }
-        return null;
-    }
-
-    /**
-     * 注册会员
-     *
-     * @param memberUser 注册信息
-     * @return 会员
-     */
-    public MemberUserDTO register(final MemberUserDTO memberUser) {
-        notNull(memberUser, "会员注册信息不能为空");
-        UserRegistryVO vo = new UserRegistryVO();
-        BeanUtils.copyProperties(memberUser, vo);
-        vo.setNickName(StringUtils.isNotBlank(memberUser.getNickName()) ? memberUser.getNickName() : memberUser.getRealName());
-        final Message<UserBaseInfoVO> msg = memberApi.register(vo);
-        isTrue(msg.isSuccess(), String.format("调用Member[注册会员[%s]]系统失败", vo));
-        final UserBaseInfoVO user = msg.getData();
-        notNull(user, String.format("调用Member[注册会员[%s]]系统失败,返回会员信息为空", vo));
-        final MemberUserDTO userDTO = new MemberUserDTO();
-        BeanUtils.copyProperties(user, userDTO);
-        return userDTO;
-    }
-
-    /**
      * 查询手机号归属地
      *
      * @param mobile
@@ -14,32 +14,14 @@ import java.util.Date;
  */
 @Data
 public class MemberUserDTO implements Serializable {
-    /**
-     * 用户Id
-     */
-    private Long userId;
-
+    private Long id;
+    private Long latestAccountId;
     /**
      * 真实姓名
      */
     private String realName;
  
     /**
-     * 会员昵称
-     */
-    private String nickName;
-
-    /**
-     * 手机号
-     */
-    private String phone;
-
-    /**
-     * 用户头像URL
-     */
-    private String avatarUrl;
-
-    /**
      * 证件类型
      */
     private Integer credentType;
@@ -50,13 +32,19 @@ public class MemberUserDTO implements Serializable {
     private String credentNo;
  
     /**
-     * 性别
-     */
-    private Integer sex;
-
-    /**
      * 生日
      */
     private Date birthday;
  
+    public Long getUserId() {
+        return id;
+    }
+
+    public Long getMemberId() {
+        return id;
+    }
+
+    public Long getAccountId() {
+        return id;
+    }
 }
@@ -12,7 +12,7 @@
     <parent>
         <groupId>cn.fw</groupId>
         <artifactId>fw-common-dependencies</artifactId>
-        <version>3.3.3</version>
+        <version>3.5.0</version>
     </parent>
  
     <modules>
@@ -36,7 +36,7 @@
         <HikariCP.version>3.3.1</HikariCP.version>
         <!-- fw -->
         <fw-oop-sdk.version>3.0.0</fw-oop-sdk.version>
-        <fw-member-sdk.version>2.0</fw-member-sdk.version>
+        <fw-member-sdk.version>3.0.0</fw-member-sdk.version>
         <fw-erp-sdk.version>5.0.0</fw-erp-sdk.version>
         <rocketmq-spring-boot-starter.version>2.1.0</rocketmq-spring-boot-starter.version>
         <redis.spring.boot.starter>1.0</redis.spring.boot.starter>