新增会员认证车辆接口

夏天
1 parent 446b378c
Showing 5 changed files with 102 additions and 22 deletions
fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/db/MemberVehicle.java
fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/dto/CustomerDetailDto.java
fw-valhalla-sdk/src/main/java/cn/fw/valhalla/sdk/api/CustomerApiService.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
@@ -21,6 +21,11 @@ public class MemberVehicle extends BaseAuditableTimeEntity&lt;MemberVehicle, Long&gt; 
      */
     private Long memberId;
     /**
+     * 所有者
+     */
+    private String name;
+
+    /**
      * 车架号
      */
     private String frameNo;
 package cn.fw.valhalla.domain.dto;
  
+import cn.fw.valhalla.common.utils.BeanUtils;
+import cn.fw.valhalla.domain.db.MemberVehicle;
 import lombok.Data;
  
 import java.math.BigDecimal;
@@ -213,4 +215,11 @@ public class CustomerDetailDto {
         }
         return buyPrice;
     }
+
+    public static CustomerDetailDto with(MemberVehicle memberVehicle){
+        CustomerDetailDto  dto = BeanUtils.copy(memberVehicle,CustomerDetailDto.class);
+        dto.setUseType(memberVehicle.getUseType().getValue());
+        dto.setCusType(memberVehicle.getCusType().getValue());
+        return dto;
+    }
 }
 \ No newline at end of file
@@ -66,17 +66,15 @@ public interface CustomerApiService {
      */
     @GetMapping("/query/by/frameNo")
     Message<CustomerInfoDto> queryByFrameNo(@RequestParam("frameNo") String frameNo, @RequestParam("groupId") Long groupId);
-
     /**
-     * 查询车辆在门店的专属顾问
+     * 通过车架号查询车辆信息，包含无档案
      *
      * @param frameNo 车架号
      * @param shopId  门店id
-     * @return 专属顾问
+     * @return 车辆信息
      */
-    @GetMapping("/query/adviser")
-    Message<Long> queryAdviser(@RequestParam("frameNo") String frameNo, @RequestParam("shopId") Long shopId);
-
+    @GetMapping("/query/vehicle/by/frameNo")
+    Message<CustomerInfoDto> queryVehicleByFrameNo(@RequestParam("frameNo") String frameNo, @RequestParam("shopId") Long shopId);
  
     /**
      * 批量查询客户档案
@@ -123,10 +123,18 @@ public class CustomerApiServiceImpl implements CustomerApiService {
     }
  
     @Override
-    @GetMapping("/query/adviser")
-    @ControllerMethod("查询车辆在门店的专属顾问")
-    public Message<Long> queryAdviser(@RequestParam("frameNo") final String frameNo, @RequestParam("shopId") final Long shopId) {
-        return success(customerBiz.queryAdviser(frameNo,shopId));
+    @GetMapping("/query/vehicle/by/frameNo")
+    @ControllerMethod("通过车架号查询车辆信息，包含无档案")
+    public Message<CustomerInfoDto> queryVehicleByFrameNo(@RequestParam("frameNo") final String frameNo, @RequestParam("shopId") final Long shopId) {
+        CustomerDetailDto detailDto = customerBiz.queryVehicleByFrameNo(frameNo, shopId);
+        if (Objects.isNull(detailDto)) {
+            return success();
+        }
+        CustomerInfoDto dto = new CustomerInfoDto();
+        BeanUtils.copyProperties(detailDto, dto);
+        dto.setConsultantId(detailDto.getAdviserId());
+        dto.setConsultantName(detailDto.getAdviserName());
+        return success(dto);
     }
  
     @GetMapping("/query/batch")
@@ -6,8 +6,7 @@ import cn.fw.common.web.annotation.DisLock;
 import cn.fw.common.web.auth.LoginAuthBean;
 import cn.fw.valhalla.common.constant.RoleCode;
 import cn.fw.valhalla.common.utils.DateUtil;
-import cn.fw.valhalla.domain.db.CompanyWechatJoin;
-import cn.fw.valhalla.domain.db.WechatSubscribe;
+import cn.fw.valhalla.domain.db.*;
 import cn.fw.valhalla.domain.db.customer.*;
 import cn.fw.valhalla.domain.db.follow.FollowRecord;
 import cn.fw.valhalla.domain.db.follow.FollowTask;
@@ -24,6 +23,7 @@ import cn.fw.valhalla.rpc.member.dto.MemberUserDTO;
 import cn.fw.valhalla.rpc.oop.OopService;
 import cn.fw.valhalla.rpc.oop.dto.ShopDTO;
 import cn.fw.valhalla.rpc.oop.dto.SpecDTO;
+import cn.fw.valhalla.sdk.enums.CusTypeEnum;
 import cn.fw.valhalla.sdk.param.*;
 import cn.fw.valhalla.sdk.result.*;
 import cn.fw.valhalla.service.bus.StammkundeBizService;
@@ -78,6 +78,7 @@ public class CustomerBizService extends AbstractCustomerService {
     private final FollowRecordService followRecordService;
     private final StammkundeBizService stammkundeBizService;
     private final OopService oopService;
+    private final MemberVehicleService memberVehicleService;
  
     @Value("${spring.cache.custom.global-prefix}:customer")
     @Getter
@@ -592,23 +593,82 @@ public class CustomerBizService extends AbstractCustomerService {
     }
  
     /**
-     * 查询车辆在门店的专属顾问
+     * 根据车架号号查询车辆信息
      *
      * @param frameNo 车架号
-     * @param shopId  门店id
-     * @return 专属顾问id
+     * @param shopId 门店id
+     * @return 车辆信息
      */
-    public Long queryAdviser(final String frameNo, final Long shopId) {
+    public CustomerDetailDto queryVehicleByFrameNo(final String frameNo, final Long shopId) {
         ShopDTO shop = oopService.shop(shopId);
-        V.notNull(shop,String.format("未查询到门店%d信息",shopId));
+        V.notNull(shop, String.format("未查询到门店%d信息", shopId));
         Customer customer = customerService.queryByFrameNo(frameNo, shop.getGroupId());
-        if(Objects.isNull(customer)){
-            return null;
+        if (Objects.isNull(customer)) {
+            MemberVehicle memberVehicle = memberVehicleService.getMemberVehicle(frameNo);
+            if (Objects.isNull(memberVehicle)) {
+                return null;
+            }
+            if (CusTypeEnum.PERSONAL.equals(memberVehicle.getCusType())) {
+                //查询该会员的其他车辆是否有档案
+                List<Long> customerBaseInfoList = customerBaseInfoService
+                        .list(Wrappers.<CustomerBaseInfo>lambdaQuery()
+                                .eq(CustomerBaseInfo::getYn, Boolean.TRUE)
+                                .eq(CustomerBaseInfo::getCusType, CusTypeEnum.PERSONAL)
+                                .eq(CustomerBaseInfo::getMemberId, memberVehicle.getMemberId()))
+                        .stream().map(CustomerBaseInfo::getId).collect(Collectors.toList());
+                if (CollectionUtils.isEmpty(customerBaseInfoList)) {
+                    return CustomerDetailDto.with(memberVehicle);
+                }
+                final List<Customer> customers = customerService.list(Wrappers.<Customer>lambdaQuery()
+                        .in(Customer::getBaseId, customerBaseInfoList).eq(Customer::getYn, true)
+                        .eq(Customer::getGroupId, shop.getGroupId()).eq(Customer::getShopId,shopId)
+                        .isNotNull(Customer::getAdviserId)
+                        .orderByDesc(Customer::getUpdateTime));
+                if (CollectionUtils.isEmpty(customers)) {
+                    return CustomerDetailDto.with(memberVehicle);
+                }
+                CustomerDetailDto dto = CustomerDetailDto.with(memberVehicle);
+                dto.setAdviserId(customers.get(0).getAdviserId());
+                UserInfoDTO user = userService.user(customers.get(0).getAdviserId());
+                if (Objects.nonNull(user)) {
+                    dto.setAdviserName(user.getUserName());
+                }
+                return dto;
+            } else {
+                //查询该单位是否有其他档案
+                List<Long> customerBaseInfoList = customerBaseInfoService
+                        .list(Wrappers.<CustomerBaseInfo>lambdaQuery()
+                                .eq(CustomerBaseInfo::getYn, Boolean.TRUE)
+                                .eq(CustomerBaseInfo::getCusType, CusTypeEnum.COMPANY)
+                                .eq(CustomerBaseInfo::getName, memberVehicle.getName()))
+                        .stream().map(CustomerBaseInfo::getId).collect(Collectors.toList());
+                if (CollectionUtils.isEmpty(customerBaseInfoList)) {
+                    return CustomerDetailDto.with(memberVehicle);
+                }
+                final List<Customer> customers = customerService.list(Wrappers.<Customer>lambdaQuery()
+                        .in(Customer::getBaseId, customerBaseInfoList).eq(Customer::getYn, true)
+                        .eq(Customer::getGroupId, shop.getGroupId()).eq(Customer::getShopId,shopId)
+                        .isNotNull(Customer::getAdviserId)
+                        .orderByDesc(Customer::getUpdateTime));
+                if (CollectionUtils.isEmpty(customers)) {
+                    return CustomerDetailDto.with(memberVehicle);
+                }
+                CustomerDetailDto dto = CustomerDetailDto.with(memberVehicle);
+                dto.setAdviserId(customers.get(0).getAdviserId());
+                UserInfoDTO user = userService.user(customers.get(0).getAdviserId());
+                if (Objects.nonNull(user)) {
+                    dto.setAdviserName(user.getUserName());
+                }
+                return dto;
+            }
         }
-        if(shopId.equals(customer.getShopId())){
-            return customer.getAdviserId();
+        CustomerDetailDto dto = renderDto(customer);
+        if (!Objects.equals(customer.getShopId(), shopId)) {
+            dto.setShopId(null);
+            dto.setAdviserId(null);
+            dto.setAdviserName(null);
         }
-        return null;
+        return dto;
     }