调整车辆认证逻辑

夏天
1 parent ed9fad03
Showing 4 changed files with 47 additions and 7 deletions
fw-valhalla-sdk/src/main/java/cn/fw/valhalla/sdk/api/CustomerApiService.java
fw-valhalla-sdk/src/main/java/cn/fw/valhalla/sdk/result/MemberVehicleDTO.java
fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/api/CustomerApiServiceImpl.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/CustomerBizService.java
@@ -4,12 +4,10 @@ import cn.fw.data.base.domain.common.Message;
 import cn.fw.valhalla.sdk.param.*;
 import cn.fw.valhalla.sdk.result.*;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
 import javax.validation.Valid;
+
 import java.util.List;
 /**
@@ -37,7 +35,7 @@ public interface CustomerApiService {
      * @param updateBuyDateParams
      */
     @PostMapping("/update/buyDate")
-    Message<Void> updateCustomerBuyDate(@Valid @RequestBody  CustomerUpdateBuyDateParams updateBuyDateParams);
+    Message<Void> updateCustomerBuyDate(@Valid @RequestBody CustomerUpdateBuyDateParams updateBuyDateParams);
     /**
      * 新增或更新售后保有客档案
@@ -235,4 +233,15 @@ public interface CustomerApiService {
      */
     @GetMapping("/query/by/keyword")
     Message<List<BasicsCustomerDTO>> queryByKeyword(@RequestParam("keyword") String keyword, @RequestParam("groupId") Long groupId);
+
+    /**
+     * 通过车架号查询认证车辆信息
+     *
+     * @param vin 车架号
+     * @return 认证车辆
+     */
+    @GetMapping("/query/vehicle/by/vin")
+    Message<MemberVehicleDTO> queryVehicle(@RequestParam("vin") String vin);
+
+
 }
@@ -14,6 +14,18 @@ import java.util.Date;
 @Data
 public class MemberVehicleDTO {
     /**
+     * 会员id
+     */
+    private Long memberId;
+    /**
+     * 会员姓名
+     */
+    private String memberName;
+    /**
+     * 会员手机号
+     */
+    private String memberPhone;
+    /**
      * 所有者
      */
     private String name;
@@ -97,7 +97,6 @@ public class CustomerApiServiceImpl implements CustomerApiService {
     @GetMapping("/query/by/mobile")
     @ControllerMethod("通过电话号码查询保有客档案列表")
     public Message<List<CustomerInfoDto>> queryByMobile(@RequestParam("mobile") String mobile, Long groupId) {
-        BV.isTrue(StringUtils.isNotBlank(mobile), "手机号不正确");
         List<CustomerDetailDto> list = customerBiz.queryByMobile(mobile, groupId);
         List<CustomerInfoDto> dtoList = new ArrayList<>();
         for (CustomerDetailDto customer : list) {
@@ -265,10 +264,17 @@ public class CustomerApiServiceImpl implements CustomerApiService {
         return success();
     }
-    @GetMapping("/query/by/keyword")
     @Override
+    @GetMapping("/query/by/keyword")
     @ControllerMethod("通过关键字查询档案列表")
     public Message<List<BasicsCustomerDTO>> queryByKeyword(@RequestParam("keyword") String keyword, @RequestParam("groupId") Long groupId) {
         return success(customerBiz.queryByKeyword(keyword, groupId));
     }
+
+    @Override
+    @GetMapping("/query/vehicle/by/vin")
+    @ControllerMethod("查询车辆认证信息")
+    public Message<MemberVehicleDTO> queryVehicle(@RequestParam("vin") final String vin) {
+        return success(customerBiz.queryVehicleByVin(vin));
+    }
 }
@@ -1018,6 +1018,19 @@ public class CustomerBizService extends AbstractCustomerService {
     }
+    public MemberVehicleDTO queryVehicleByVin(String vin) {
+        MemberVehicle memberVehicle = memberVehicleService.getVehicle(vin);
+        if (Objects.isNull(memberVehicle)) {
+            return null;
+        }
+        MemberVehicleDTO dto = BeanUtils.copy(memberVehicle, MemberVehicleDTO.class);
+        dto.setCusType(memberVehicle.getCusType().getValue());
+        dto.setUseType(memberVehicle.getUseType().getValue());
+        MemberUserDTO member = memberRpcService.user(memberVehicle.getMemberId());
+        dto.setMemberPhone(Objects.nonNull(member) ? member.getPhone() : null);
+        return dto;
+    }
+
     private AffiliationRecord createEntity(CustomerDetailDto customer) {
         AffiliationRecord record = new AffiliationRecord();