Merge remote-tracking branch 'origin/test'

张志伟
2 parents 1269a598 b3244f6a
Showing 4 changed files with 43 additions and 8 deletions
fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/vo/ipt/CustomerInitClueVO.kt
fw-valhalla-rpc/src/main/java/cn/fw/valhalla/rpc/member/MemberRpcService.java
fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/app/InitClueController.kt
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/ipt/CustomerInitClueBizService.kt
@@ -15,26 +15,48 @@ import java.util.*
  */
 @NoArg
 data class CustomerInitClueVO(
+    /** id */
     val id: Long,
+    /** 车牌号  */
     val plateNo: String?,
+    /** 车架号 */
     val vin: String,
+    /** 品牌 */
     val brandName: String?,
+    /** 车系 */
     val seriesName: String?,
+    /** 车型 */
     val specName: String?,
+    /** 发动机号 */
     val engineNo: String?,
+    /** 购车日期 */
     val buyDate: LocalDate?,
+    /** 客户名称 */
     val customerName: String?,
+    /** 客户电话 */
     val customerMobile: String,
+    /** 电话归属地 */
+    var cMobileRegion: String? = null,
+    /** 上次进站时间 */
     val arrivalTime: LocalDateTime?,
+    /** 上次进站里程 */
     val arrivalMileage: Int?,
+    /** 最后一次送修人 */
     val senderName: String?,
+    /** 最后一次送修人电话 */
     val senderMobile: String,
+    /** 电话归属地 */
+    var sMobileRegion: String? = null,
+    /** 顾问id */
     val adviserId: Long,
+    /** 顾问名称 */
     val adviserName: String?,
+    /** 门店id */
     val shopId: Long,
+    /** 门店名称 */
     val shopName: String,
+    /** 集团id */
     val groupId: Long,
-    val yn: Boolean,
-    val createTime: Date,
-    val updateTime: Date?,
+    /** 导入时间 */
+    val createTime: Date
 )
 package cn.fw.valhalla.rpc.member;
  
 import cn.fw.common.util.MobileUtil;
+import cn.fw.common.util.ValidationUtils;
 import cn.fw.data.base.domain.common.Message;
 import cn.fw.member.sdk.api.AccountApi;
 import cn.fw.member.sdk.api.FunctionApi;
@@ -119,7 +120,7 @@ public class MemberRpcService {
      */
     @Cacheable(cacheNames = "mobile:attribution", key = "#mobile", unless = "#result.isEmpty()")
     public String attribution(final String mobile) {
-        if (StringUtils.isBlank(mobile)) {
+        if (StringUtils.isBlank(mobile) || !ValidationUtils.checkMobile(mobile)) {
             return "";
         }
         try {
@@ -9,6 +9,7 @@ import cn.fw.security.auth.client.annotation.IgnoreAuth
 import cn.fw.security.auth.client.enums.AuthType
 import cn.fw.valhalla.domain.query.InitClueQueryVO
 import cn.fw.valhalla.domain.vo.ipt.CustomerInitClueVO
+import cn.fw.valhalla.domain.vo.ipt.InitClueCallLogVO
 import cn.fw.valhalla.service.bus.ipt.CustomerInitClueBizService
 import org.springframework.validation.annotation.Validated
 import org.springframework.web.bind.annotation.GetMapping
@@ -34,4 +35,11 @@ class InitClueController(private val customerInitClueBizService: CustomerInitClu
     fun customerPool(queryVO: InitClueQueryVO): Message<AppPage<CustomerInitClueVO>> {
         return success(customerInitClueBizService.listPage(queryVO))
     }
+
+    @IgnoreAuth
+    @GetMapping("/history")
+    @ControllerMethod("查询历史跟进数据")
+    fun customerPoolHistory(clueId: Long): Message<List<InitClueCallLogVO>> {
+        return success(customerInitClueBizService.callLog(clueId))
+    }
 }
 \ No newline at end of file
@@ -8,6 +8,7 @@ import cn.fw.valhalla.domain.query.InitClueQueryVO
 import cn.fw.valhalla.domain.vo.AppPageVO
 import cn.fw.valhalla.domain.vo.ipt.CustomerInitClueVO
 import cn.fw.valhalla.domain.vo.ipt.InitClueCallLogVO
+import cn.fw.valhalla.rpc.member.MemberRpcService
 import cn.fw.valhalla.rpc.oop.OopService
 import cn.fw.valhalla.service.data.CustomerInitClueCallLogService
 import cn.fw.valhalla.service.data.CustomerInitClueService
@@ -28,7 +29,8 @@ import java.util.function.Function
 class CustomerInitClueBizService(
     private val customerInitClueService: CustomerInitClueService,
     private val customerInitClueCallLogService: CustomerInitClueCallLogService,
-    private val oopService: OopService
+    private val oopService: OopService,
+    private val memberRpcService: MemberRpcService
 ) {
     /**
      * 查询池子数据
@@ -52,7 +54,10 @@ class CustomerInitClueBizService(
         customerInitClueService.page(ipage, ktQuery)
         page.total = ipage.total
         page.data = ipage.records?.mapNotNull {
-            it.toCustomerInitClueVO { id -> oopService.shop(id)?.shopName ?: "-" }
+            it.toCustomerInitClueVO { id -> oopService.shop(id)?.shopName ?: "-" }.apply {
+                cMobileRegion = memberRpcService.attribution(customerMobile)
+                sMobileRegion = memberRpcService.attribution(senderMobile)
+            }
         }
         return page
     }
@@ -64,6 +69,7 @@ class CustomerInitClueBizService(
         return customerInitClueCallLogService.list(
             KtQueryWrapper(CustomerInitClueCallLog::class.java)
                 .eq(CustomerInitClueCallLog::clueId, clueId)
+                .orderByAsc(CustomerInitClueCallLog::uploadTime)
         )?.map {
             InitClueCallLogVO(
                 id = it.id,
@@ -100,9 +106,7 @@ fun CustomerInitClue.toCustomerInitClueVO(fn: Function&lt;Long, String&gt;): CustomerI
         shopId = this.shopId,
         shopName = shopName,
         groupId = this.groupId,
-        yn = this.yn,
         createTime = this.createTime,
-        updateTime = this.updateTime,
     )
 }