feature(*): 新增查询续保成交的数据

- 升级sdk新增查询接口 - 新增查询续保成交的数据

feature(*): 新增查询续保成交的数据
- 升级sdk新增查询接口 - 新增查询续保成交的数据
张志伟
1 parent 70fa45d7
Showing 11 changed files with 171 additions and 119 deletions
fw-valhalla-dao/src/main/resources/mapper/ClueTaskMapper.xml
fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/dto/ShouldBeCompletedDTO.java
fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/query/BeCompletedQuery.java
fw-valhalla-sdk/pom.xml
fw-valhalla-sdk/src/main/java/cn/fw/valhalla/sdk/api/FollowApiService.java
fw-valhalla-sdk/src/main/java/cn/fw/valhalla/sdk/param/ShouldBeCompletedQuery.java
fw-valhalla-sdk/src/main/java/cn/fw/valhalla/sdk/result/ShouldBeCompletedResult.java
fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/api/FollowApiServiceImpl.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/FollowApiBizService.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/FollowApiBizService.kt
pom.xml
@@ -195,7 +195,8 @@
         t2.vin,
         t1.follow_user user_id,
         t1.follow_user_name user_name,
-        t1.follow_shop shop_id
+        t1.follow_shop shop_id,
+        t1.state state
         from clue_task t1
         inner join follow_clue t2 on t1.clue_id = t2.id
         <where>
@@ -29,4 +29,8 @@ public class ShouldBeCompletedDTO {
      * 门店id
      */
     private Long shopId;
+    /**
+     * 状态 1：进行中 2：已成交 3：战败
+     */
+    private Integer state;
 }
 package cn.fw.valhalla.domain.query;
  
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
  
  
 /**
@@ -13,6 +15,8 @@ import lombok.Data;
  * @date : 2022-10-20 14:53
  */
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class BeCompletedQuery {
     /**
      * 跟进人员id
@@ -10,7 +10,7 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>fw-valhalla-sdk</artifactId>
-    <version>1.2.4</version>
+    <version>1.2.5</version>
     <packaging>jar</packaging>
     <name>fw-valhalla-sdk</name>
  
@@ -46,6 +46,13 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>false</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
                 <version>${maven-source-plugin.version}</version>
                 <executions>
@@ -52,4 +52,13 @@ public interface FollowApiService {
      */
     @GetMapping("/should/ins/completed")
     Message<List<ShouldBeCompletedResult>> queryInsShouldBeCompleted(@Validated @SpringQueryMap ShouldBeCompletedQuery query);
+
+    /**
+     * 查询续保跟进成交数据
+     *
+     * @param query 查询参数
+     * @return 人员
+     */
+    @GetMapping("/ins/completed_arr")
+    Message<List<ShouldBeCompletedResult>> queryInsCompletedGuys(@Validated @SpringQueryMap ShouldBeCompletedQuery query);
 }
 \ No newline at end of file
@@ -42,7 +42,7 @@ public class ShouldBeCompletedQuery {
             return String.valueOf(second);
         }
         String timeStr = String.valueOf(startTime);
-        return timeStr.length() >= 9 ? timeStr.substring(0, 9) : timeStr;
+        return timeStr.length() >= 10 ? timeStr.substring(0, 10) : timeStr;
     }
  
     public String getEndTime() {
@@ -51,6 +51,6 @@ public class ShouldBeCompletedQuery {
             return String.valueOf(second);
         }
         String timeStr = String.valueOf(endTime);
-        return timeStr.length() >= 9 ? timeStr.substring(0, 9) : timeStr;
+        return timeStr.length() >= 10 ? timeStr.substring(0, 10) : timeStr;
     }
 }
 package cn.fw.valhalla.sdk.result;
  
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
  
 /**
  * 应成交数据
@@ -12,6 +14,8 @@ import lombok.Data;
  * @date : 2022-10-20 11:35
  */
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class ShouldBeCompletedResult {
     /**
      * 车架号
@@ -29,4 +33,8 @@ public class ShouldBeCompletedResult {
      * 门店id
      */
     private Long shopId;
+    /**
+     * 状态 1：进行中 2：已成交 3：战败
+     */
+    private Integer state;
 }
@@ -79,4 +79,11 @@ public class FollowApiServiceImpl implements FollowApiService {
     public Message<List<ShouldBeCompletedResult>> queryInsShouldBeCompleted(@Validated @SpringQueryMap ShouldBeCompletedQuery query) {
         return success(followApiBizService.queryShouldBeCompleted(query, FollowTypeEnum.IR));
     }
+
+    @Override
+    @GetMapping("/ins/completed_arr")
+    @ControllerMethod("查询续保跟进应成交台数")
+    public Message<List<ShouldBeCompletedResult>> queryInsCompletedGuys(@Validated @SpringQueryMap ShouldBeCompletedQuery query) {
+        return success(followApiBizService.queryCompletedGuys(query, FollowTypeEnum.IR));
+    }
 }
-package cn.fw.valhalla.service.bus.follow;
-
-import cn.fw.valhalla.domain.db.customer.AccidentPool;
-import cn.fw.valhalla.domain.db.follow.ClueTask;
-import cn.fw.valhalla.domain.db.follow.FollowClue;
-import cn.fw.valhalla.domain.dto.ShouldBeCompletedDTO;
-import cn.fw.valhalla.domain.enums.ClueStatusEnum;
-import cn.fw.valhalla.domain.enums.FollowTypeEnum;
-import cn.fw.valhalla.domain.query.BeCompletedQuery;
-import cn.fw.valhalla.sdk.param.ShouldBeCompletedQuery;
-import cn.fw.valhalla.sdk.result.ShouldBeCompletedResult;
-import cn.fw.valhalla.service.data.AccidentPoolService;
-import cn.fw.valhalla.service.data.ClueTaskService;
-import cn.fw.valhalla.service.data.FollowClueService;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * 跟进api接口业务实现
- *
- * @author : kurisu
- * @version : 1.0
- * @className : FollowApiBizService
- * @description : 跟进api接口业务实现
- * @date : 2022-10-20 14:35
- */
-@Service
-public class FollowApiBizService {
-    private final ClueTaskService clueTaskService;
-    private final AccidentPoolService accidentPoolService;
-    private final FollowClueService followClueService;
-
-    @Autowired
-    public FollowApiBizService(final ClueTaskService clueTaskService,
-                               final AccidentPoolService accidentPoolService,
-                               final FollowClueService followClueService) {
-        this.clueTaskService = clueTaskService;
-        this.accidentPoolService = accidentPoolService;
-        this.followClueService = followClueService;
-    }
-
-    /**
-     * 查询应成交台数
-     *
-     * @param query
-     * @param followTypeEnum
-     * @return
-     */
-    public List<ShouldBeCompletedResult> queryShouldBeCompleted(ShouldBeCompletedQuery query, FollowTypeEnum followTypeEnum) {
-        BeCompletedQuery search = new BeCompletedQuery();
-        search.setType(followTypeEnum.getValue());
-        search.setShopId(query.getShopId());
-        search.setUserId(query.getUserId());
-        search.setStartTime(query.getStartTime());
-        search.setEndTime(query.getEndTime());
-        List<ShouldBeCompletedDTO> dtoList = clueTaskService.queryShouldBeCompleted(search);
-        List<ShouldBeCompletedResult> results = new ArrayList<>();
-        for (ShouldBeCompletedDTO dto : dtoList) {
-            ShouldBeCompletedResult result = new ShouldBeCompletedResult();
-            result.setVin(dto.getVin());
-            result.setUserId(dto.getUserId());
-            result.setUserName(dto.getUserName());
-            result.setShopId(dto.getShopId());
-            results.add(result);
-        }
-        return results;
-    }
-
-    public ClueTask queryAccidentFollowerByPlate(String plateNo, Long groupId) {
-        AccidentPool lastOne = accidentPoolService.getOne(Wrappers.<AccidentPool>lambdaQuery()
-                .eq(AccidentPool::getPlateNo, plateNo)
-                .eq(AccidentPool::getGroupId, groupId)
-                .orderByDesc(AccidentPool::getCreateTime)
-                .last(" limit 1 ")
-        );
-
-        if (Objects.isNull(lastOne)) {
-            return null;
-        }
-        FollowClue lastOngoingClue = followClueService.getOne(Wrappers.<FollowClue>lambdaQuery()
-                .eq(FollowClue::getPlateNo, plateNo)
-                .eq(FollowClue::getClueType, FollowTypeEnum.AC)
-                .eq(FollowClue::getClueState, ClueStatusEnum.ONGOING)
-                .eq(FollowClue::getGroupId, groupId)
-                .last(" limit 1 ")
-        );
-
-        if (Objects.isNull(lastOngoingClue)) {
-            return null;
-        }
-        return clueTaskService.queryOngoingTaskByClueId(lastOngoingClue.getId());
-    }
-}
+package cn.fw.valhalla.service.bus.follow;
+
+import cn.fw.valhalla.domain.db.customer.AccidentPool
+import cn.fw.valhalla.domain.db.follow.ClueTask
+import cn.fw.valhalla.domain.db.follow.FollowClue
+import cn.fw.valhalla.domain.enums.ClueStatusEnum
+import cn.fw.valhalla.domain.enums.FollowTypeEnum
+import cn.fw.valhalla.domain.enums.TaskStateEnum
+import cn.fw.valhalla.domain.query.BeCompletedQuery
+import cn.fw.valhalla.sdk.param.ShouldBeCompletedQuery
+import cn.fw.valhalla.sdk.result.ShouldBeCompletedResult
+import cn.fw.valhalla.service.data.AccidentPoolService
+import cn.fw.valhalla.service.data.ClueTaskService
+import cn.fw.valhalla.service.data.FollowClueService
+import com.baomidou.mybatisplus.core.toolkit.Wrappers
+import org.springframework.stereotype.Service
+import java.util.*
+
+/**
+ * 跟进api接口业务实现
+ *
+ * @author : kurisu
+ * @version : 1.0
+ * @className : FollowApiBizService
+ * @description : 跟进api接口业务实现
+ * @date : 2022-10-20 14:35
+ */
+@Service
+class FollowApiBizService(
+    val clueTaskService: ClueTaskService,
+    val accidentPoolService: AccidentPoolService,
+    val followClueService: FollowClueService
+) {
+
+
+    /**
+     * 查询已成交续保数据
+     *
+     * @param query
+     * @param followTypeEnum
+     * @return
+     */
+    fun queryCompletedGuys(
+        query: ShouldBeCompletedQuery,
+        followTypeEnum: FollowTypeEnum
+    ): List<ShouldBeCompletedResult> {
+        val search = BeCompletedQuery()
+        search.type = followTypeEnum.value
+        search.shopId = query.shopId
+        search.userId = query.userId
+        search.startTime = query.startTime
+        search.endTime = query.endTime
+        val dtoList = clueTaskService.queryShouldBeCompleted(search)
+        return dtoList
+            .filter { TaskStateEnum.COMPLETE.value.equals(it.state) }
+            .map {
+                ShouldBeCompletedResult(
+                    it.vin,
+                    it.userId,
+                    it.userName,
+                    it.shopId,
+                    it.state
+                )
+            }
+    }
+
+    /**
+     * 查询应成交台数
+     *
+     * @param query
+     * @param followTypeEnum
+     * @return
+     */
+    fun queryShouldBeCompleted(
+        query: ShouldBeCompletedQuery,
+        followTypeEnum: FollowTypeEnum
+    ): List<ShouldBeCompletedResult> {
+        val search = BeCompletedQuery(
+            query.userId,
+            query.shopId,
+            query.startTime,
+            query.endTime,
+            followTypeEnum.value
+        )
+        val dtoList = clueTaskService.queryShouldBeCompleted(search)
+        return dtoList.map {
+            ShouldBeCompletedResult(
+                it.vin,
+                it.userId,
+                it.userName,
+                it.shopId,
+                it.state
+            )
+        }
+    }
+
+    fun queryAccidentFollowerByPlate(plateNo: String, groupId: Long): ClueTask? {
+        val lastOne = accidentPoolService.getOne(
+            Wrappers.lambdaQuery<AccidentPool>()
+                .eq(AccidentPool::getPlateNo, plateNo)
+                .eq(AccidentPool::getGroupId, groupId)
+                .orderByDesc(AccidentPool::getCreateTime)
+                .last(" limit 1 ")
+        )
+
+        if (Objects.isNull(lastOne)) {
+            return null
+        }
+        val lastOngoingClue = followClueService.getOne(
+            Wrappers.lambdaQuery<FollowClue>()
+                .eq(FollowClue::getPlateNo, plateNo)
+                .eq(FollowClue::getClueType, FollowTypeEnum.AC)
+                .eq(FollowClue::getClueState, ClueStatusEnum.ONGOING)
+                .eq(FollowClue::getGroupId, groupId)
+                .last(" limit 1 ")
+        );
+
+        if (Objects.isNull(lastOngoingClue)) {
+            return null;
+        }
+        return clueTaskService.queryOngoingTaskByClueId(lastOngoingClue.id);
+    }
+}
@@ -122,7 +122,7 @@
             <dependency>
                 <groupId>cn.fw</groupId>
                 <artifactId>fw-valhalla-sdk</artifactId>
-                <version>1.2.4</version>
+                <version>1.2.5</version>
             </dependency>
             <dependency>
                 <groupId>cn.fw</groupId>
@@ -300,14 +300,17 @@
         <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>
@@ -343,22 +346,6 @@
         </plugins>
     </build>
  
-    <repositories>
-        <repository>
-            <id>aliyun</id>
-            <name>aliyun</name>
-            <url>https://maven.aliyun.com/nexus/content/groups/public/</url>
-        </repository>
-    </repositories>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>aliyun</id>
-            <name>aliyun</name>
-            <url>https://maven.aliyun.com/nexus/content/groups/public/</url>
-        </pluginRepository>
-    </pluginRepositories>
-
     <distributionManagement>
         <repository>
             <id>feewee-maven-releases</id>