Merge remote-tracking branch 'origin/dev' into test

张志伟
2 parents 89c3bbf3 6b1e138d
Showing 19 changed files with 169 additions and 169 deletions
fw-shirasawa-common/pom.xml
fw-shirasawa-dao/pom.xml
fw-shirasawa-domain/pom.xml
fw-shirasawa-domain/src/main/java/cn/fw/shirasawa/domain/enums/FollowTypeEnum.java
fw-shirasawa-rpc/src/main/java/cn/fw/shirasawa/rpc/ehr/EhrRpcService.java
fw-shirasawa-rpc/src/main/java/cn/fw/shirasawa/rpc/erp/UserService.java
fw-shirasawa-sdk/pom.xml
fw-shirasawa-sdk/src/main/java/cn/fw/shirasawa/sdk/enums/DataTypeEnum.java
fw-shirasawa-sdk/src/main/java/cn/fw/shirasawa/sdk/param/FollowGenerateDTO.java
fw-shirasawa-server/pom.xml
fw-shirasawa-server/src/main/resources/application-gray.yml
fw-shirasawa-server/src/main/resources/application-prd.yml
fw-shirasawa-server/src/main/resources/application-test.yml
fw-shirasawa-server/src/main/resources/application.yml
fw-shirasawa-service/pom.xml
fw-shirasawa-service/src/main/java/cn/fw/shirasawa/service/bus/follow/PoolBizService.java
fw-shirasawa-service/src/main/java/cn/fw/shirasawa/service/bus/follow/strategy/AbstractFollowStrategy.java
fw-shirasawa-service/src/main/java/cn/fw/shirasawa/service/bus/follow/strategy/impl/SFFollowStrategy.java
pom.xml
@@ -58,15 +58,4 @@
         </dependency>
     </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>
 \ No newline at end of file
@@ -34,16 +34,4 @@
             <artifactId>fw-shirasawa-common</artifactId>
         </dependency>
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>
 \ No newline at end of file
@@ -35,16 +35,4 @@
             <artifactId>fw-shirasawa-sdk</artifactId>
         </dependency>
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>
 \ No newline at end of file
@@ -25,6 +25,7 @@ public enum FollowTypeEnum implements IEnum&lt;Integer&gt; {
     FA(8, "急救跟进"),
     RV(9, "回访跟进"),
     PL(10, "公共池跟进"),
+    SF(11, "补贴跟进"),
     /**
      * 其他
      * 目前只用于设置，并不参与具体跟进业务
@@ -6,6 +6,7 @@ import cn.fw.ehr.sdk.api.result.StaffInfo;
 import cn.fw.shirasawa.common.utils.StringUtils;
 import cn.fw.shirasawa.rpc.AbsBaseRpcService;
 import cn.fw.shirasawa.rpc.ehr.dto.StaffInfoDTO;
+import cn.fw.shirasawa.rpc.erp.dto.UserInfoDTO;
 import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
@@ -37,6 +38,22 @@ public class EhrRpcService extends AbsBaseRpcService {
     }
     @Nullable
+    public UserInfoDTO user(final Long userId) {
+        StaffInfoDTO staffInfoDTO = queryStaffInfo(userId);
+        if (Objects.isNull(staffInfoDTO)) {
+            return null;
+        }
+        return UserInfoDTO.builder()
+                .id(staffInfoDTO.getId())
+                .userName(staffInfoDTO.getName())
+                .headImg(staffInfoDTO.getAvatar())
+                .mobile(staffInfoDTO.getMobile())
+                .nickName(staffInfoDTO.getName())
+                .groupId(staffInfoDTO.getGroupId())
+                .build();
+    }
+
+    @Nullable
     public StaffInfoDTO queryStaffInfo(final Long userId) {
         if (userId == null) {
             return null;
 package cn.fw.shirasawa.rpc.erp;
 import cn.fw.data.base.domain.common.Message;
-import cn.fw.erp.sdk.api.UserApi;
 import cn.fw.erp.sdk.api.UserRoleApi;
-import cn.fw.erp.sdk.api.result.UserBaseInfo;
 import cn.fw.erp.sdk.api.result.UserRoleDataRange;
 import cn.fw.erp.sdk.api.result.UserRoleInfo;
-import cn.fw.shirasawa.common.utils.StringUtils;
 import cn.fw.shirasawa.rpc.AbsBaseRpcService;
 import cn.fw.shirasawa.rpc.erp.dto.PostUserDTO;
-import cn.fw.shirasawa.rpc.erp.dto.UserInfoDTO;
 import cn.fw.shirasawa.rpc.erp.dto.UserRoleDataRangeDTO;
 import com.alibaba.fastjson.JSONObject;
 import lombok.Getter;
@@ -26,10 +22,6 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
-import static org.apache.commons.lang3.Validate.isTrue;
-import static org.apache.commons.lang3.Validate.notNull;
 /**
  * 用户服务
@@ -43,10 +35,6 @@ import static org.apache.commons.lang3.Validate.notNull;
 @RequiredArgsConstructor
 public class UserService extends AbsBaseRpcService {
     /**
-     * 用户服务
-     */
-    private final UserApi userApi;
-    /**
      * 岗位用户服务
      */
     private final UserRoleApi userRoleApi;
@@ -56,83 +44,6 @@ public class UserService extends AbsBaseRpcService {
     private String keyPrefix;
     /**
-     * 根据用户ID获取用户信息
-     *
-     * @param userId 用户ID
-     * @return 用户信息
-     */
-    public UserInfoDTO user(final Long userId) {
-        if (Objects.isNull(userId)) {
-            return null;
-        }
-        String key = generateKey(userId);
-        String json = getFromCache(key);
-        if (StringUtils.isValid(json)) {
-            return JSONObject.parseObject(json, UserInfoDTO.class);
-        }
-        try {
-            final Message<UserBaseInfo> msg = userApi.queryUserBaseInfo(userId);
-            isTrue(msg.isSuccess(), String.format("调用ERP[根据用户ID[%s]获取用户信息]系统失败", msg.getResult()));
-            final UserBaseInfo userBaseInfo = msg.getData();
-            if (!msg.isSuccess() || Objects.isNull(msg.getData())) {
-                return null;
-            }
-            UserInfoDTO userInfoDTO = new UserInfoDTO();
-            userInfoDTO.setId(userBaseInfo.getUserId());
-            userInfoDTO.setUserName(userBaseInfo.getUserName());
-            userInfoDTO.setHeadImg(userBaseInfo.getHeadImg());
-            userInfoDTO.setMobile(msg.getData().getMobile());
-            setToCache(key, JSONObject.toJSONString(userInfoDTO), 60);
-            return userInfoDTO;
-        } catch (Exception e) {
-            log.info("调用ERP[根据用户ID[{}]获取用户信息]系统失败", userId, e);
-        }
-        return null;
-    }
-
-    /**
-     * 批量获取用户名字
-     *
-     * @param userIds 用户ID集合
-     * @return 用户姓名集合
-     */
-    public List<String> userNames(final List<Long> userIds) {
-        if (CollectionUtils.isEmpty(userIds)) {
-            return Collections.emptyList();
-        }
-        Message<List<UserBaseInfo>> userMsg = userApi.queryUserBaseInfos(userIds);
-        isTrue(userMsg.isSuccess(), "批量获取用户信息失败");
-        notNull(userMsg.getData(), "批量获取用户信息为空");
-        return userMsg.getData().stream().map(UserBaseInfo::getUserName).collect(Collectors.toList());
-    }
-
-    /**
-     * 批量获取用户
-     *
-     * @param userIds 用户ID集合
-     * @return 用户集合
-     */
-    public List<UserInfoDTO> users(final List<Long> userIds) {
-        if (CollectionUtils.isEmpty(userIds)) {
-            return Collections.emptyList();
-        }
-        Message<List<UserBaseInfo>> userMsg = userApi.queryUserBaseInfos(userIds);
-        isTrue(userMsg.isSuccess(), "批量获取用户信息失败");
-        notNull(userMsg.getData(), "批量获取用户信息为空");
-        List<UserInfoDTO> result = new ArrayList<>();
-        List<UserBaseInfo> userBaseInfoList = userMsg.getData();
-        for (UserBaseInfo userBaseInfo : userBaseInfoList) {
-            UserInfoDTO userInfoDTO = new UserInfoDTO();
-            userInfoDTO.setId(userBaseInfo.getUserId());
-            userInfoDTO.setUserName(userBaseInfo.getUserName());
-            userInfoDTO.setHeadImg(userBaseInfo.getHeadImg());
-            userInfoDTO.setMobile(userBaseInfo.getMobile());
-            result.add(userInfoDTO);
-        }
-        return result;
-    }
-
-    /**
      * 获取某个流程角色的权限范围
      *
      * @param userId
@@ -10,7 +10,7 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>fw-shirasawa-sdk</artifactId>
-    <version>1.0.2</version>
+    <version>1.0.3</version>
     <packaging>jar</packaging>
     <name>fw-shirasawa-sdk</name>
@@ -57,6 +57,13 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>false</skip>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>
 \ No newline at end of file
@@ -25,6 +25,7 @@ public enum DataTypeEnum implements IEnum&lt;Integer&gt; {
     FA(8, "急救"),
     RV(9, "回访"),
     PL(10, "公共池跟进"),
+    SF(11, "补贴跟进"),
     ;
     /**
@@ -4,6 +4,7 @@ import cn.fw.shirasawa.sdk.enums.BusinessTypeEnum;
 import cn.fw.shirasawa.sdk.enums.DataTypeEnum;
 import lombok.*;
+import javax.validation.constraints.Future;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
@@ -76,6 +77,7 @@ public class FollowGenerateDTO {
     /**
      * 截止时间
      */
+    @Future(message = "截止时间必须是未来时间")
     private Date deadline;
     /**
      * 首次跟进待办截止时间
@@ -149,13 +149,6 @@
                     <executable>true</executable>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
@@ -56,6 +56,7 @@ follow:
     PFCode: 'O6zZjZ17st'
     FACode: ''
     RVCode: ''
+    SFCode: ''
   FmTemplateCode: 'SMS_215116996'
   RmTemplateCode: 'SMS_215072079'
   IrTemplateCode: ''
@@ -55,6 +55,7 @@ follow:
     PFCode: 'O6zZjZ17st'
     FACode: ''
     RVCode: ''
+    SFCode: ''
   FmTemplateCode: 'SMS_215116996'
   RmTemplateCode: 'SMS_215072079'
   IrTemplateCode: ''
@@ -66,6 +66,7 @@ follow:
     PFCode: 'O6zZjZ17st'
     FACode: ''
     RVCode: ''
+    SFCode: ''
   FmTemplateCode: ''
   RmTemplateCode: ''
   IrTemplateCode: ''
 \ No newline at end of file
@@ -145,6 +145,7 @@ follow:
     FACode: ''
     RVCode: ''
     PLCode: ''
+    SFCode: ''
   FmTemplateCode: ''
   RmTemplateCode: ''
   IrTemplateCode: ''
@@ -117,15 +117,4 @@
             <artifactId>fw-dfs-sdk</artifactId>
         </dependency>
     </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>
 \ No newline at end of file
@@ -15,12 +15,15 @@ import cn.fw.shirasawa.domain.vo.SecretReportHistoryVO;
 import cn.fw.shirasawa.domain.vo.pool.CluePoolVO;
 import cn.fw.shirasawa.domain.vo.pool.FollowPoolListVO;
 import cn.fw.shirasawa.domain.vo.pool.FollowRecordPoolVO;
-import cn.fw.shirasawa.rpc.erp.UserService;
+import cn.fw.shirasawa.rpc.ehr.EhrRpcService;
 import cn.fw.shirasawa.rpc.erp.dto.UserInfoDTO;
 import cn.fw.shirasawa.rpc.member.MemberRpcService;
 import cn.fw.shirasawa.rpc.oop.OopService;
 import cn.fw.shirasawa.rpc.oop.dto.ShopDTO;
-import cn.fw.shirasawa.service.data.*;
+import cn.fw.shirasawa.service.data.CluePoolService;
+import cn.fw.shirasawa.service.data.FollowRecordService;
+import cn.fw.shirasawa.service.data.FollowTaskService;
+import cn.fw.shirasawa.service.data.SecretReportHistoryService;
 import cn.hutool.core.date.BetweenFormater;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -46,11 +49,10 @@ public class PoolBizService {
     private final FollowTaskService followTaskService;
     private final CluePoolService cluePoolService;
     private final OopService oopService;
-    private final UserService userService;
     private final MemberRpcService memberRpcService;
     private final SecretReportHistoryService secretReportHistoryService;
     private final FollowRecordService followRecordService;
-    private final FollowRecordLogService followRecordLogService;
+    private final EhrRpcService ehrRpcService;
     /**
@@ -170,7 +172,7 @@ public class PoolBizService {
         BeanUtils.copyProperties(poolDTO, vo);
         vo.setFollower(poolDTO.getFollowUserName());
         if (StringUtils.isEmpty(poolDTO.getFollowUserName()) && Objects.nonNull(poolDTO.getUserId())) {
-            UserInfoDTO user = userService.user(poolDTO.getUserId());
+            UserInfoDTO user = ehrRpcService.user(poolDTO.getUserId());
             if (Objects.nonNull(user)) {
                 vo.setFollower(user.getUserName());
             }
@@ -194,7 +194,7 @@ public abstract class AbstractFollowStrategy implements FollowStrategy {
         for (CluePool cluePool : cluePoolList) {
             cluePool.setFinishShopId(taskCompleteDTO.getShopId());
             cluePool.setFinishUserId(taskCompleteDTO.getUserId());
-            UserInfoDTO user = userService.user(taskCompleteDTO.getUserId());
+            UserInfoDTO user = ehrRpcService.user(taskCompleteDTO.getUserId());
             if (Objects.nonNull(user)) {
                 cluePool.setFinishUserName(user.getUserName());
             }
@@ -695,7 +695,7 @@ public abstract class AbstractFollowStrategy implements FollowStrategy {
      */
     protected boolean dealRepeatClue(CluePool cluePool, FollowStrategy strategy) {
         //判断是否可以去重
-        if (null == cluePool.getCoverFlag() || Boolean.FALSE.equals(cluePool.getCoverFlag())) {
+        if (!Boolean.TRUE.equals(cluePool.getCoverFlag())) {
             return false;
         }
         boolean isContainAF = false;
+package cn.fw.shirasawa.service.bus.follow.strategy.impl;
+
+import cn.fw.shirasawa.domain.db.OriginalData;
+import cn.fw.shirasawa.domain.db.follow.FollowRecord;
+import cn.fw.shirasawa.domain.db.follow.FollowTask;
+import cn.fw.shirasawa.domain.db.pool.CluePool;
+import cn.fw.shirasawa.domain.enums.ClueStatusEnum;
+import cn.fw.shirasawa.domain.enums.FollowTypeEnum;
+import cn.fw.shirasawa.service.bus.follow.strategy.AbstractFollowStrategy;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
+import static cn.fw.common.businessvalidator.Validator.BV;
+
+/**
+ * 补贴跟进
+ *
+ * @author : kurisu
+ * @version : 1.0
+ * @className : SFFollowStrategy
+ * @description : 补贴跟进
+ * @date : 2023-03-13 15:16
+ */
+@Slf4j
+@Component
+@SuppressWarnings("Duplicates")
+public class SFFollowStrategy extends AbstractFollowStrategy {
+    @Value("${follow.todo.SFCode}")
+    @Getter
+    private String SFCode;
+
+    @Override
+    public FollowTypeEnum getFollowType() {
+        return FollowTypeEnum.SF;
+    }
+
+    @Override
+    public String getTodoCode() {
+        return getSFCode();
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean origin2task(OriginalData originalData) throws Exception {
+        List<CluePool> list = cluePoolService.list(Wrappers.<CluePool>lambdaQuery()
+                .eq(CluePool::getClueType, getFollowType())
+                .eq(CluePool::getCustomerId, originalData.getCustomerId())
+                .eq(CluePool::getRefererId, originalData.getDetailId())
+                .eq(CluePool::getGroupId, originalData.getGroupId())
+                .in(CluePool::getClueStatus, ClueStatusEnum.ONGOING, ClueStatusEnum.WAITING)
+        );
+        if (!CollectionUtils.isEmpty(list)) {
+            return true;
+        }
+        CluePool cluePool = transformClue(originalData);
+        cluePool.setStartTime(originalData.getGenerateTime());
+        LocalDateTime deadLine = Optional.ofNullable(originalData.getDeadline()).orElse(LocalDate.now().plusYears(10L).atStartOfDay());
+        cluePool.setDeadline(deadLine.minusSeconds(1L));
+        return cluePoolService.save(cluePool);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void startClue(CluePool cluePool) throws Exception {
+        dealRepeatClue(cluePool, this);
+        FollowTask task = this.createTask(cluePool);
+        boolean saveTask = followTaskService.save(task);
+        BV.isTrue(saveTask, () -> "生成跟进任务失败");
+        FollowRecord record = createRecord(task);
+        record.setTodoCode(getTodoCode());
+        record.setNote(cluePool.getNote());
+        record.setContacts(cluePool.getContacts());
+        if (Objects.nonNull(cluePool.getFirstDeadline())) {
+            record.setDeadline(cluePool.getFirstDeadline());
+        }
+        followRecordService.save(record);
+
+        cluePool.setClueStatus(ClueStatusEnum.ONGOING);
+        cluePoolService.updateById(cluePool);
+    }
+}
@@ -12,7 +12,7 @@
     <parent>
         <groupId>cn.fw</groupId>
         <artifactId>fw-common-dependencies</artifactId>
-        <version>3.3.0</version>
+        <version>3.3.1</version>
     </parent>
     <modules>
@@ -28,7 +28,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>1.8</java.version>
-        <fw.shirasawa.sdk>1.0.2</fw.shirasawa.sdk>
+        <fw.shirasawa.sdk>1.0.3</fw.shirasawa.sdk>
         <!-- util -->
         <spring-retry.version>1.2.4.RELEASE</spring-retry.version>
         <!-- database -->
@@ -222,6 +222,26 @@
             <artifactId>lombok</artifactId>
             <scope>provided</scope>
         </dependency>
+        <!-- kotlin -->
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-stdlib</artifactId>
+            <version>${kotlin.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-reflect</artifactId>
+            <version>${kotlin.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-stdlib-jdk8</artifactId>
+            <version>${kotlin.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.module</groupId>
+            <artifactId>jackson-module-kotlin</artifactId>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -232,6 +252,10 @@
     <build>
         <plugins>
             <plugin>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
@@ -240,38 +264,30 @@
                 </configuration>
             </plugin>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>versions-maven-plugin</artifactId>
             </plugin>
         </plugins>
     </build>
-    <repositories>
-        <repository>
-            <id>feewee-maven-public</id>
-            <name>feewee maven public</name>
-            <url>http://nexus.feewee.cn/nexus/content/groups/public/</url>
-            <releases>
-                <enabled>true</enabled>
-                <updatePolicy>always</updatePolicy>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>always</updatePolicy>
-            </snapshots>
-        </repository>
-    </repositories>
     <distributionManagement>
         <repository>
             <id>feewee-maven-releases</id>
             <name>Nexus Release Repository</name>
-            <url>http://nexus.feewee.cn/nexus/content/repositories/releases/</url>
+            <url>https://nexus.feewee.cn/nexus/content/repositories/releases/</url>
         </repository>
         <snapshotRepository>
             <id>feewee-maven-snapshots</id>
             <name>Nexus Snapshot Repository</name>
-            <url>http://nexus.feewee.cn/nexus/content/repositories/snapshots/</url>
+            <url>https://nexus.feewee.cn/nexus/content/repositories/snapshots/</url>
             <uniqueVersion>true</uniqueVersion>
         </snapshotRepository>
     </distributionManagement>