feat(*): 升级新版会员

- 升级新版会员

feat(*): 升级新版会员
- 升级新版会员
张志伟
1 parent fb57e7eb
Showing 15 changed files with 344 additions and 252 deletions
fw-shirasawa-rpc/pom.xml
fw-shirasawa-rpc/src/main/java/cn/fw/shirasawa/rpc/member/MemberRpcService.java
fw-shirasawa-rpc/src/main/java/cn/fw/shirasawa/rpc/member/dto/MemberUserDTO.java
fw-shirasawa-rpc/src/main/java/cn/fw/shirasawa/rpc/member/dto/MemberUserLevelDTO.java
fw-shirasawa-rpc/src/main/java/cn/fw/shirasawa/rpc/member/dto/UserAccountDTO.java
fw-shirasawa-rpc/src/main/java/cn/fw/shirasawa/rpc/passport/PassportService.java
fw-shirasawa-sdk/src/main/java/cn/fw/shirasawa/sdk/param/FollowGenerateDTO.java
fw-shirasawa-server/pom.xml
fw-shirasawa-server/src/main/java/cn/fw/shirasawa/server/controller/app/DebugController.kt
fw-shirasawa-service/pom.xml
fw-shirasawa-service/src/main/java/cn/fw/shirasawa/component/MemberPhoneChangeConsumer.kt
fw-shirasawa-service/src/main/java/cn/fw/shirasawa/service/bus/follow/DebugBizService.kt
fw-shirasawa-service/src/main/java/cn/fw/shirasawa/service/bus/follow/FollowBizService.java
fw-shirasawa-service/src/main/java/cn/fw/shirasawa/service/bus/follow/strategy/AbstractFollowStrategy.java
pom.xml
@@ -26,11 +26,7 @@
             <groupId>cn.fw</groupId>
             <artifactId>fw-oop-sdk</artifactId>
         </dependency>
-        <!--Passport SDK-->
-        <dependency>
-            <groupId>cn.fw</groupId>
-            <artifactId>fw-passport-sdk</artifactId>
-        </dependency>
+
         <dependency>
             <groupId>cn.fw</groupId>
             <artifactId>fw-sms-sdk</artifactId>
@@ -2,13 +2,16 @@ package cn.fw.shirasawa.rpc.member;
  
 import cn.fw.common.util.MobileUtil;
 import cn.fw.data.base.domain.common.Message;
+import cn.fw.member.sdk.api.AccountApi;
 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.AccountInfoVo;
+import cn.fw.member.sdk.vo.MemberInfoVo;
+import cn.fw.member.sdk.vo.MemberPhoneInfoVo;
 import cn.fw.member.sdk.vo.MobileLocation;
-import cn.fw.member.sdk.vo.UserBaseInfoVO;
 import cn.fw.shirasawa.rpc.AbsBaseRpcService;
 import cn.fw.shirasawa.rpc.member.dto.MemberUserDTO;
+import cn.fw.shirasawa.rpc.member.dto.UserAccountDTO;
 import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -16,12 +19,9 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cache.annotation.Cacheable;
+import org.springframework.lang.Nullable;
 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 java.util.concurrent.CompletableFuture;
  
@@ -40,6 +40,7 @@ public class MemberRpcService extends AbsBaseRpcService {
      * 会员服务
      */
     private final MemberApi memberApi;
+    private final AccountApi accountApi;
     private final FunctionApi functionApi;
  
     @Value("${spring.cache.custom.global-prefix}:rpc:member")
@@ -55,65 +56,25 @@ public class MemberRpcService extends AbsBaseRpcService {
         if (userId == null || userId <= 0) {
             return null;
         }
-        String key = String.format("%s:member-info:%s", getKeyPrefix(), userId);
-        MemberUserDTO memberUserDTO = getFromCache(key, MemberUserDTO.class);
-        if (Objects.nonNull(memberUserDTO)) {
-            return memberUserDTO;
-        }
         try {
-            final Message<UserBaseInfoVO> msg = memberApi.queryUserByuserId(userId);
+            final Message<MemberPhoneInfoVo> msg = memberApi.getMemberPhoneById(userId);
             if (!msg.isSuccess()) {
-                log.warn("调用Member[根据会员ID[{}]获取会员信息]系统失败, 原因：{}", userId, msg.getResult());
+                log.warn("调用Member系统[根据会员ID[{}]获取会员信息]失败, 原因：{}", userId, msg.getResult());
                 return null;
             }
-            final UserBaseInfoVO user = msg.getData();
+            final MemberPhoneInfoVo user = msg.getData();
             if (user != null) {
                 final MemberUserDTO userDTO = new MemberUserDTO();
                 BeanUtils.copyProperties(user, userDTO);
-                setToCache(key, JSONObject.toJSONString(userDTO), 60 * 3);
                 return userDTO;
             }
         } catch (Exception e) {
-            log.warn("调用Member[根据会员ID[{}]获取会员信息]系统失败", userId);
+            log.error("调用Member系统[根据会员ID[{}]获取会员信息]失败", userId, e);
         }
         return null;
     }
  
     /**
-     * 根据会员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.warn("调用Member[根据会员ID集合[{}]获取会员列表]系统失败", userIds);
-        }
-        return Collections.emptyList();
-    }
-
-    /**
      * 根据手机号查询会员信息
      *
      * @param mobile 手机号
@@ -129,18 +90,50 @@ public class MemberRpcService extends AbsBaseRpcService {
             return memberUserDTO;
         }
         try {
-            final Message<UserBaseInfoVO> msg = memberApi.queryUserByMobile(mobile);
+            Message<AccountInfoVo> accountMsg = accountApi.getAccountByPhone(mobile);
+            isTrue(accountMsg.isSuccess(), String.format("调用Member系统失败: [根据会员手机号[%s]获取会员信息: %s]", mobile, accountMsg.getResult()));
+            AccountInfoVo account = accountMsg.getData();
+            if (account == null) {
+                log.error("手机号[{}]不存在任何账号信息", mobile);
+                return null;
+            }
+            final Message<MemberInfoVo> msg = memberApi.getMemberById(account.getMemberId());
             isTrue(msg.isSuccess(), String.format("调用Member系统失败: [根据会员手机号[%s]获取会员信息]", mobile));
-            final UserBaseInfoVO user = msg.getData();
+            final MemberInfoVo user = msg.getData();
             if (Objects.isNull(user)) {
                 return null;
             }
             final MemberUserDTO userDTO = new MemberUserDTO();
             BeanUtils.copyProperties(user, userDTO);
-            setToCache(key, JSONObject.toJSONString(userDTO), 60 * 3);
+            userDTO.setLatestAccountId(account.getId());
+            userDTO.setLatestAccountPhone(account.getPhone());
+            setToCache(key, JSONObject.toJSONString(userDTO), 15);
             return userDTO;
         } catch (Exception e) {
-            log.warn("调用Member系统根据会员手机号[{}]获取会员信息失败", mobile);
+            log.error("调用Member系统根据会员手机号[{}]获取会员信息失败", mobile, e);
+        }
+        return null;
+    }
+
+    @Nullable
+    public UserAccountDTO accountById(final Long accountId) {
+        if (accountId == null || accountId <= 0) {
+            return null;
+        }
+        try {
+            final Message<AccountInfoVo> msg = accountApi.getAccountById(accountId);
+            if (!msg.isSuccess()) {
+                log.warn("调用Member系统[根据账号ID[{}]获取账号信息]失败, 原因：{}", accountId, msg.getResult());
+                return null;
+            }
+            final AccountInfoVo account = msg.getData();
+            if (account != null) {
+                final UserAccountDTO accountDTO = new UserAccountDTO();
+                BeanUtils.copyProperties(account, accountDTO);
+                return accountDTO;
+            }
+        } catch (Exception e) {
+            log.error("调用Member系统[根据账号ID[{}]获取账号信息]失败", accountId, e);
         }
         return null;
     }
@@ -15,27 +15,49 @@ import java.util.Date;
 @Data
 public class MemberUserDTO implements Serializable {
     private static final long serialVersionUID = 2363764577624856885L;
-    private Long userId;
-    private String cardNo;
+    /**
+     * 会员号
+     */
+    private Long id;
+    /**
+     * 账号
+     */
+    private Long latestAccountId;
+    /**
+     * 电话
+     */
+    private String latestAccountPhone;
+    /**
+     * 姓名
+     */
     private String realName;
-    private String nickName;
-    private String phone;
-    private Integer sex;
-    private Date birthday;
+    /**
+     * 生日
+     */
+    private Date birthDate;
+    /**
+     * 认证资料类型
+     */
     private Integer credentType;
+    /**
+     * 身份证号
+     */
     private String credentNo;
-    private Integer education;
-    private Integer maritalStatus;
-    private String email;
-    private Integer registerSrc;
-    private String province;
-    private String city;
-    private String area;
-    private String detailAddress;
-    private String zip;
-    private String image;
-    private Long dealerId;
-    private Long groupId;
-    private Long shopId;
-    private Date createTime;
+
+    public Long getUserId() {
+        return id;
+    }
+
+    public Long getMemberId() {
+        return id;
+    }
+
+    public Long getAccountId() {
+        return latestAccountId;
+    }
+
+
+    public String getPhone() {
+        return latestAccountPhone;
+    }
 }
-package cn.fw.shirasawa.rpc.member.dto;
-
-import lombok.Data;
-
-/**
- * 客户level
- * <p>
- * create at 2019-05-16
- *
- * @author kurisu
- */
-@Data
-public class MemberUserLevelDTO {
-    private Long cusId;
-    private Integer levelType;
-    private Integer growth;
-    private String cusName;
-    private String phone;
-}
+package cn.fw.shirasawa.rpc.member.dto;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 会员账号信息
+ *
+ * @author : kurisu
+ * @version : 2.0
+ * @desc : 会员账号信息
+ * @date : 2023-12-13 16:00
+ */
+@Data
+public class UserAccountDTO {
+    /**
+     * 账户id
+     */
+    private Long id;
+
+    /**
+     * 会员id
+     */
+    private Long memberId;
+
+    /**
+     * 真实姓名
+     */
+    private String realName;
+
+    /**
+     * 证件号码
+     */
+    private String credentNo;
+
+    /**
+     * 认证时间
+     */
+    private Date credentTime;
+
+    /**
+     * 账户昵称
+     */
+    private String nickName;
+
+    /**
+     * 手机号
+     */
+    private String phone;
+
+    /**
+     * 性别 0 未知 1男 2女
+     */
+    private Integer sex;
+
+    /**
+     * 生日
+     */
+    private Date birthday;
+
+    /**
+     * 用户头像URL
+     */
+    private String avatarUrl;
+
+    /**
+     * unionId
+     */
+    private String unionId;
+
+    /**
+     * 会员状态 0冻结 1正常
+     */
+    private Integer status;
+
+    /**
+     * 上次激活时间
+     */
+    private Date lastActive;
+
+    /**
+     * 冻结时间
+     */
+    private Date blockTime;
+
+    /**
+     * 备注
+     */
+    private String remark;
+}
-package cn.fw.shirasawa.rpc.passport;
-
-import cn.fw.common.exception.BusinessException;
-import cn.fw.data.base.domain.common.Message;
-import cn.fw.passport.sdk.api.MiniQrCodeApi;
-import cn.fw.passport.sdk.api.param.WxBCodeParam;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * 会员外部服务
- *
- * @author kurisu
- */
-@Slf4j
-@Service
-public class PassportService {
-
-    @Autowired
-    private MiniQrCodeApi miniQrCodeApi;
-
-    /**
-     * 获取小程序二维码
-     *
-     * @param param
-     * @return
-     */
-    public byte[] getWxBCode(WxBCodeParam param) {
-        try {
-            Message<byte[]> message = miniQrCodeApi.getWxBCode(param);
-            if (!message.isSuccess()) {
-                log.error("调用passport api 生成小程序码业务异常：{}", message.getResult());
-                throw new BusinessException(message.getCode(), message.getResult());
-            }
-            return message.getData();
-        } catch (Exception e) {
-            log.error("会员系统调用失败", e);
-            throw new BusinessException("调用会员系统异常");
-        }
-    }
-
-
-}
@@ -32,7 +32,6 @@ import java.util.Objects;
         @ScriptAssert(lang = "javascript", script = "_this.checkContact()", message = "联系方式不能为空"),
         @ScriptAssert(lang = "javascript", script = "_this.checkName()", message = "客户名称不能为空"),
         @ScriptAssert(lang = "javascript", script = "_this.checkCustomerId()", message = "档案id不能为空"),
-        @ScriptAssert(lang = "javascript", script = "_this.checkMemberId()", message = "会员号不能为空"),
         @ScriptAssert(lang = "javascript", script = "_this.checkFollowDuration()", message = "必须指定待办的跟进时长"),
         @ScriptAssert(lang = "javascript", script = "_this.checkActivityNo()", message = "活动编号不能为空"),
 })
@@ -151,15 +150,15 @@ public class FollowGenerateDTO {
     }
  
     public boolean checkContact() {
-        if (DataTypeEnum.RC.equals(this.type)) {
-            return this.contacts != null && !this.contacts.isEmpty();
-        }
         if (DataTypeEnum.AC.equals(this.type)) {
             return this.plateNo != null &&
                     !this.plateNo.isEmpty() &&
                     this.contacts != null &&
                     !this.contacts.isEmpty();
         }
+        if (Objects.isNull(this.memberId)) {
+            return this.contacts != null && !this.contacts.isEmpty();
+        }
         return true;
     }
  
@@ -170,12 +169,6 @@ public class FollowGenerateDTO {
         return true;
     }
  
-    public boolean checkMemberId() {
-        if (BusinessTypeEnum.PS.equals(this.businessType) && !DataTypeEnum.RC.equals(this.type)) {
-            return Objects.nonNull(this.memberId);
-        }
-        return true;
-    }
  
     public boolean checkFollowDuration() {
         if (DataTypeEnum.AC.equals(this.type)) {
@@ -66,15 +66,7 @@
             <groupId>cn.fw</groupId>
             <artifactId>fw-shirasawa-service</artifactId>
         </dependency>
-        <!-- fw-remote -->
-        <dependency>
-            <groupId>cn.fw</groupId>
-            <artifactId>fw-auth-client</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>cn.fw</groupId>
-            <artifactId>fw-fastdfs-client</artifactId>
-        </dependency>
+
         <!-- fw-common -->
         <dependency>
             <groupId>cn.fw</groupId>
-package cn.fw.shirasawa.server.controller.app;
+package cn.fw.shirasawa.server.controller.app
  
-import cn.fw.common.web.annotation.ControllerMethod;
-import cn.fw.data.base.domain.common.Message;
-import cn.fw.security.auth.client.annotation.Authorization;
-import cn.fw.security.auth.client.enums.AuthType;
-import cn.fw.shirasawa.service.bus.follow.DebugBizService;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.validation.constraints.NotNull;
-
-import static cn.fw.common.web.util.ResultBuilder.success;
+import cn.fw.common.web.annotation.ControllerMethod
+import cn.fw.common.web.util.ResultBuilder.success
+import cn.fw.data.base.domain.common.Message
+import cn.fw.security.auth.client.annotation.Authorization
+import cn.fw.security.auth.client.enums.AuthType
+import cn.fw.shirasawa.service.bus.follow.DebugBizService
+import org.springframework.validation.annotation.Validated
+import org.springframework.web.bind.annotation.*
+import javax.validation.constraints.NotNull
  
 /**
  * debug类
@@ -26,19 +20,26 @@ import static cn.fw.common.web.util.ResultBuilder.success;
  * @ignore
  * @date : 2023-03-23 16:04
  */
-@Slf4j
 @RestController
 @Authorization(AuthType.NONE)
 @Validated
-@RequiredArgsConstructor
 @RequestMapping("/app/debug")
-public class DebugController {
-    private final DebugBizService debugBizService;
+class DebugController(private val debugBizService: DebugBizService) {
  
     @GetMapping("/fix/telstatus")
     @ControllerMethod("跟进电话数据处理类")
-    public Message<Integer> fixTelStatus(@NotNull(message = "集团id不能为空") final Long groupId) {
-        int i = debugBizService.fixTelStatus(groupId);
-        return success(i);
+    fun fixTelStatus(@NotNull(message = "集团id不能为空") groupId: Long): Message<Int> {
+        val i = debugBizService.fixTelStatus(groupId)
+        return success(i)
+    }
+
+    @PostMapping("/member/telchange")
+    @ControllerMethod("会员电话变更")
+    fun memberPhoneChange(
+        @RequestParam(name = "memberId") memberId: Long,
+        @RequestParam(name = "accountId") accountId: Long
+    ): Message<Void> {
+        debugBizService.memberPhoneChange(memberId, accountId)
+        return success()
     }
 -}
+}
 \ No newline at end of file
@@ -63,10 +63,6 @@
         </dependency>
         <dependency>
             <groupId>cn.fw</groupId>
-            <artifactId>fw-passport-sdk</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>cn.fw</groupId>
             <artifactId>fw-ehr-sdk</artifactId>
         </dependency>
         <dependency>
+package cn.fw.shirasawa.component
+
+import cn.fw.member.sdk.event.MemberLatestBindEvent
+import cn.fw.shirasawa.domain.db.follow.FollowTask
+import cn.fw.shirasawa.domain.enums.TaskStateEnum
+import cn.fw.shirasawa.rpc.member.MemberRpcService
+import cn.fw.shirasawa.rpc.member.dto.UserAccountDTO
+import cn.fw.shirasawa.service.data.FollowTaskService
+import com.baomidou.mybatisplus.core.toolkit.Wrappers
+import lombok.extern.slf4j.Slf4j
+import org.apache.rocketmq.spring.annotation.RocketMQMessageListener
+import org.apache.rocketmq.spring.core.RocketMQListener
+import org.springframework.stereotype.Component
+
+/**
+ * 会员手机变更
+ *
+ * @author : kurisu
+ * @version : 2.1
+ * @description : 会员手机变更
+ * @date : 2023-04-07 15:12
+ */
+@Slf4j
+@Component
+@RocketMQMessageListener(
+    topic = MemberLatestBindEvent.TOPIC,
+    consumerGroup = "\${spring.application.name}_latest_account"
+)
+class MemberPhoneChangeConsumer(
+    private val memberRpcService: MemberRpcService,
+    private val followTaskService: FollowTaskService
+) :
+    RocketMQListener<MemberLatestBindEvent> {
+
+    override fun onMessage(message: MemberLatestBindEvent?) {
+        message ?: return
+        val account: UserAccountDTO = memberRpcService.accountById(message.newBindAccountId) ?: return
+        with(account) {
+            val taskList = followTaskService.list(
+                Wrappers.lambdaQuery<FollowTask?>()
+                    .eq(FollowTask::getMemberId, message.memberId)
+                    .eq(FollowTask::getState, TaskStateEnum.ONGOING)
+                    .ne(FollowTask::getContacts, phone)
+            )
+            if (taskList.isNotEmpty()) {
+                taskList.forEach { task -> task.contacts = phone }
+                followTaskService.updateBatchById(taskList)
+            }
+        }
+    }
+}
-package cn.fw.shirasawa.service.bus.follow;
-
-import cn.fw.shirasawa.domain.db.follow.FollowRecord;
-import cn.fw.shirasawa.domain.db.other.SecretReportHistory;
-import cn.fw.shirasawa.domain.enums.CallStateEnum;
-import cn.fw.shirasawa.service.data.FollowRecordService;
-import cn.fw.shirasawa.service.data.SecretReportHistoryService;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-
-import java.util.List;
+package cn.fw.shirasawa.service.bus.follow
+
+import cn.fw.shirasawa.domain.db.follow.FollowRecord
+import cn.fw.shirasawa.domain.db.follow.FollowTask
+import cn.fw.shirasawa.domain.db.other.SecretReportHistory
+import cn.fw.shirasawa.domain.enums.CallStateEnum
+import cn.fw.shirasawa.domain.enums.TaskStateEnum
+import cn.fw.shirasawa.rpc.member.MemberRpcService
+import cn.fw.shirasawa.rpc.member.dto.UserAccountDTO
+import cn.fw.shirasawa.service.data.FollowRecordService
+import cn.fw.shirasawa.service.data.FollowTaskService
+import cn.fw.shirasawa.service.data.SecretReportHistoryService
+import com.baomidou.mybatisplus.core.toolkit.Wrappers
+import lombok.extern.slf4j.Slf4j
+import org.springframework.stereotype.Service
+import org.springframework.transaction.annotation.Transactional
  
 /**
  * 调试类
@@ -22,38 +23,65 @@ import java.util.List;
  * @desc : 调试类
  * @date : 2023-08-29 17:27
  */
-@RequiredArgsConstructor
 @Service
 @Slf4j
-public class DebugBizService {
-    private final FollowRecordService followRecordService;
-    private final SecretReportHistoryService secretReportHistoryService;
+class DebugBizService(
+    private val followRecordService: FollowRecordService,
+    private val memberRpcService: MemberRpcService,
+    private val followTaskService: FollowTaskService,
+    private val secretReportHistoryService: SecretReportHistoryService
+) {
  
-    @Transactional(rollbackFor = Exception.class)
-    public int fixTelStatus(Long groupId) {
-        List<FollowRecord> list = followRecordService.list(Wrappers.<FollowRecord>lambdaQuery()
+    @Transactional(rollbackFor = [Exception::class])
+    fun fixTelStatus(groupId: Long?): Int {
+        val list = followRecordService.list(
+            Wrappers.lambdaQuery<FollowRecord>()
                 .eq(FollowRecord::getGroupId, groupId)
-                .eq(FollowRecord::getYn, Boolean.TRUE)
-                .eq(FollowRecord::getAddTodo, Boolean.TRUE)
+                .eq(FollowRecord::getYn, true)
+                .eq(FollowRecord::getAddTodo, true)
                 .isNull(FollowRecord::getCalled)
                 .last(" limit 500")
-        );
-        if (CollectionUtils.isEmpty(list)) {
-            return 0;
+        )
+        if (list.isEmpty()) {
+            return 0
         }
-        for (FollowRecord record : list) {
-            List<SecretReportHistory> reportHistoryList = secretReportHistoryService.list(Wrappers.<SecretReportHistory>lambdaQuery()
+
+        list.forEach { record ->
+            val reportHistoryList = secretReportHistoryService.list(
+                Wrappers.lambdaQuery<SecretReportHistory>()
                     .eq(SecretReportHistory::getGroupId, groupId)
-                    .eq(SecretReportHistory::getFollowRecordId, record.getId())
-            );
-            if (CollectionUtils.isEmpty(reportHistoryList)) {
-                record.setCalled(CallStateEnum.WAIT_DIAL);
+                    .eq(SecretReportHistory::getFollowRecordId, record.id)
+            )
+
+            if (reportHistoryList.isEmpty()) {
+                record.called = CallStateEnum.WAIT_DIAL
             } else {
-                boolean anyMatch = reportHistoryList.stream().anyMatch(r -> r.getCallDuration() >= 30L);
-                record.setCalled(anyMatch ? CallStateEnum.EFFECTIVE_DIAL : CallStateEnum.INEFFECTIVE_DIAL);
+                val anyMatch = reportHistoryList.any { r -> r.callDuration >= 30L }
+                record.called = if (anyMatch) CallStateEnum.EFFECTIVE_DIAL else CallStateEnum.INEFFECTIVE_DIAL
+            }
+
+        }
+
+        followRecordService.updateBatchById(list)
+        return list.size
+    }
+
+    /**
+     * 模拟测试会员手机号变更
+     */
+    fun memberPhoneChange(memberId: Long, accountId: Long) {
+        val account: UserAccountDTO = memberRpcService.accountById(accountId) ?: return
+        with(account) {
+            val taskList = followTaskService.list(
+                Wrappers.lambdaQuery<FollowTask?>()
+                    .eq(FollowTask::getMemberId, memberId)
+                    .eq(FollowTask::getState, TaskStateEnum.ONGOING)
+                    .ne(FollowTask::getContacts, phone)
+            )
+            if (taskList.isNotEmpty()) {
+                taskList.forEach { task -> task.contacts = phone }
+                followTaskService.updateBatchById(taskList)
             }
         }
-        followRecordService.updateBatchById(list);
-        return list.size();
     }
 -}
+}
 \ No newline at end of file
@@ -846,15 +846,16 @@ public class FollowBizService {
         final FollowRecord record = followRecordService.getById(recordId);
         BV.notNull(record, () -> "跟进信息不存在");
         BV.isTrue(record.getYn(), () -> "跟进信息不存在");
+        Long memberId = record.getMemberId();
         String contacts = record.getContacts();
-        if (StringUtils.isEmpty(contacts)) {
-            MemberUserDTO memberUserDTO = memberRpcService.user(record.getMemberId());
-            BV.notNull(memberUserDTO, () -> "档案信息异常，请稍后再试");
+        if (Objects.nonNull(memberId) && memberId > 0) {
+            MemberUserDTO memberUserDTO = memberRpcService.user(memberId);
+            BV.notNull(memberUserDTO, () -> "客户信息信息异常，请稍后再试");
             contacts = memberUserDTO.getPhone();
             record.setContacts(memberUserDTO.getPhone());
             followRecordService.updateById(record);
         }
-        return contacts;
+        return Optional.ofNullable(contacts).orElse("#");
     }
  
     /**
@@ -911,7 +912,7 @@ public class FollowBizService {
      */
     @Transactional(rollbackFor = Exception.class)
     public void readCallReport2Task(CallReportDTO dto) {
-        if (Objects.isNull(dto.getMemberId()) || dto.getMemberId() < 0) {
+        if (Objects.isNull(dto.getMemberId()) || dto.getMemberId() <= 0) {
             MemberUserDTO memberInfo = memberRpcService.queryByMobile(dto.getPeerNo());
             if (Objects.nonNull(memberInfo)) {
                 dto.setMemberId(memberInfo.getUserId());
@@ -119,7 +119,7 @@ public abstract class AbstractFollowStrategy implements FollowStrategy {
                 if (FollowTypeEnum.AF.equals(task.getType())) {
                     record.setCompelTel(Boolean.FALSE);
                 } else {
-                    record.setCompelTel(ValidationUtils.checkMobile(record.getContacts()));
+                    record.setCompelTel(ValidationUtils.checkMobile(record.getContacts()) || (Objects.nonNull(record.getMemberId()) && record.getMemberId() > 0));
                 }
             }
             if (StringUtils.isEmpty(record.getContacts())) {
@@ -822,13 +822,16 @@ public abstract class AbstractFollowStrategy implements FollowStrategy {
         task.setTimes(0);
         task.setGroupId(originalData.getGroupId());
  
-        MemberUserDTO memberUserDTO = memberRpcService.user(originalData.getMemberId());
-        if (Objects.nonNull(memberUserDTO)) {
-            if (StringUtils.isValid(memberUserDTO.getRealName())) {
-                task.setCustomerName(memberUserDTO.getRealName());
+        if (Objects.nonNull(originalData.getMemberId()) && originalData.getMemberId() > 0) {
+            MemberUserDTO memberUserDTO = memberRpcService.user(originalData.getMemberId());
+            if (Objects.nonNull(memberUserDTO)) {
+                if (StringUtils.isValid(memberUserDTO.getRealName())) {
+                    task.setCustomerName(memberUserDTO.getRealName());
+                }
+                task.setContacts(memberUserDTO.getPhone());
             }
-            task.setContacts(memberUserDTO.getPhone());
         }
+
         return task;
     }
 }
@@ -12,7 +12,7 @@
     <parent>
         <groupId>cn.fw</groupId>
         <artifactId>fw-common-dependencies</artifactId>
-        <version>3.3.2</version>
+        <version>3.5.0</version>
     </parent>
  
     <modules>
@@ -36,12 +36,10 @@
         <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>
         <fw-pstn-sdk.version>2.0.0</fw-pstn-sdk.version>
-        <fw-fastdfs-client.version>2.0</fw-fastdfs-client.version>
         <rocketmq-spring-boot-starter.version>2.1.0</rocketmq-spring-boot-starter.version>
-        <fw-passport-sdk.version>2.2.0</fw-passport-sdk.version>
         <hanlp.version>portable-1.7.4</hanlp.version>
         <fw-angel-sdk.version>3.0.0</fw-angel-sdk.version>
         <redis.spring.boot.starter>1.0</redis.spring.boot.starter>
@@ -120,11 +118,6 @@
             </dependency>
             <dependency>
                 <groupId>cn.fw</groupId>
-                <artifactId>fw-fastdfs-client</artifactId>
-                <version>${fw-fastdfs-client.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>cn.fw</groupId>
                 <artifactId>fw-member-sdk</artifactId>
                 <version>${fw-member-sdk.version}</version>
             </dependency>
@@ -150,11 +143,6 @@
             </dependency>
             <dependency>
                 <groupId>cn.fw</groupId>
-                <artifactId>fw-passport-sdk</artifactId>
-                <version>${fw-passport-sdk.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>cn.fw</groupId>
                 <artifactId>fw-valhalla-sdk</artifactId>
                 <version>${fw-valhalla-sdk}</version>
             </dependency>