新增会员认证车辆接口

夏天
1 parent b6f6af27
Showing 6 changed files with 106 additions and 4 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
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/data/MemberVehicleService.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/data/impl/MemberVehicleServiceImpl.java
@@ -66,6 +66,7 @@ public interface CustomerApiService {
      */
     @GetMapping("/query/by/frameNo")
     Message<CustomerInfoDto> queryByFrameNo(@RequestParam("frameNo") String frameNo, @RequestParam("groupId") Long groupId);
+
     /**
      * 通过车架号查询车辆信息，包含无档案
      *
@@ -187,6 +188,15 @@ public interface CustomerApiService {
     Message<List<CarArchiveDTO>> queryByMemberId(@RequestParam("memberId") Long memberId);
  
     /**
+     * 查询会员认证车辆
+     *
+     * @param memberId 会员id
+     * @return 认证车辆
+     */
+    @GetMapping("/query/vehicle/by/memberId")
+    Message<List<MemberVehicleDTO>> queryVehicleByMemberId(@RequestParam("memberId") Long memberId);
+
+    /**
      * 通过发动机号查询档案
      *
      * @param engineNo
+package cn.fw.valhalla.sdk.result;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 会员认证车辆
+ * <p>
+ * create at 2022-06-07
+ *
+ * @author xiatian
+ */
+@Data
+public class MemberVehicleDTO {
+    /**
+     * 所有者
+     */
+    private String name;
+
+    /**
+     * 车架号
+     */
+    private String frameNo;
+    /**
+     * 车牌号
+     */
+    private String plateNo;
+    /**
+     * 发动机号
+     */
+    private String engineNo;
+    /**
+     * 注册日期
+     */
+    private Date regDate;
+    /**
+     * 品牌
+     */
+    private String brandName;
+    /**
+     * 整车型号
+     */
+    private String specCode;
+    /**
+     * 车辆类型 1：个人 2：单位
+     */
+    private Integer cusType;
+    /**
+     * 使用性质 1:非运营 2：运营
+     */
+    private Integer useType;
+}
@@ -223,6 +223,13 @@ public class CustomerApiServiceImpl implements CustomerApiService {
     }
  
     @Override
+    @GetMapping("/query/vehicle/by/frameNo")
+    @ControllerMethod("查询会员认证车辆")
+    public Message<List<MemberVehicleDTO>> queryVehicleByMemberId(@RequestParam("memberId") final Long memberId) {
+        return success(customerBiz.queryVehicleByMemberId(memberId));
+    }
+
+    @Override
     @GetMapping("/query/by/engineNo")
     @ControllerMethod("通过发动机号查询保有客档案")
     public Message<CustomerInfoDto> queryByEngineNo(@RequestParam("engineNo") String engineNo, @RequestParam("groupId") Long groupId) {
@@ -5,6 +5,7 @@ import cn.fw.common.page.AppPage;
 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.BeanUtils;
 import cn.fw.valhalla.common.utils.DateUtil;
 import cn.fw.valhalla.domain.db.*;
 import cn.fw.valhalla.domain.db.customer.*;
@@ -36,7 +37,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
@@ -596,7 +596,7 @@ public class CustomerBizService extends AbstractCustomerService {
      * 根据车架号号查询车辆信息
      *
      * @param frameNo 车架号
-     * @param shopId 门店id
+     * @param shopId  门店id
      * @return 车辆信息
      */
     public CustomerDetailDto queryVehicleByFrameNo(final String frameNo, final Long shopId) {
@@ -621,7 +621,7 @@ public class CustomerBizService extends AbstractCustomerService {
                 }
                 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)
+                        .eq(Customer::getGroupId, shop.getGroupId()).eq(Customer::getShopId, shopId)
                         .isNotNull(Customer::getAdviserId)
                         .orderByDesc(Customer::getUpdateTime));
                 if (CollectionUtils.isEmpty(customers)) {
@@ -647,7 +647,7 @@ public class CustomerBizService extends AbstractCustomerService {
                 }
                 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)
+                        .eq(Customer::getGroupId, shop.getGroupId()).eq(Customer::getShopId, shopId)
                         .isNotNull(Customer::getAdviserId)
                         .orderByDesc(Customer::getUpdateTime));
                 if (CollectionUtils.isEmpty(customers)) {
@@ -866,6 +866,20 @@ public class CustomerBizService extends AbstractCustomerService {
         return list;
     }
  
+    public List<MemberVehicleDTO> queryVehicleByMemberId(Long memberId) {
+        List<MemberVehicle> memberVehicleList = memberVehicleService.getMemberVehicle(memberId);
+        if (CollectionUtils.isEmpty(memberVehicleList)) {
+            return Collections.emptyList();
+        }
+        return memberVehicleList.stream().map(v -> {
+            MemberVehicleDTO dto = BeanUtils.copy(v, MemberVehicleDTO.class);
+            dto.setCusType(v.getCusType().getValue());
+            dto.setUseType(v.getUseType().getValue());
+            return dto;
+        }).collect(Collectors.toList());
+
+    }
+
  
     private AffiliationRecord createEntity(CustomerDetailDto customer) {
         AffiliationRecord record = new AffiliationRecord();
@@ -3,6 +3,8 @@ package cn.fw.valhalla.service.data;
 import cn.fw.valhalla.domain.db.MemberVehicle;
 import com.baomidou.mybatisplus.extension.service.IService;
  
+import java.util.List;
+
 /**
  * 会员认证车辆
  * <p>
@@ -18,4 +20,12 @@ public interface MemberVehicleService extends IService&lt;MemberVehicle&gt; {
      * @return 认证车辆
      */
     MemberVehicle getMemberVehicle(String frameNo);
+
+    /**
+     * 查询认证车辆
+     *
+     * @param memberId 会员id
+     * @return 认证车辆
+     */
+    List<MemberVehicle> getMemberVehicle(Long memberId);
 }
@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
  
+import java.util.List;
+
 /**
  * 会员认证车辆
  * <p>
@@ -22,4 +24,10 @@ public class MemberVehicleServiceImpl extends ServiceImpl&lt;MemberVehicleMapper, M
         return baseMapper.selectOne(Wrappers.<MemberVehicle>lambdaQuery()
                 .eq(MemberVehicle::getYn, Boolean.TRUE).eq(MemberVehicle::getFrameNo, frameNo));
     }
+
+    @Override
+    public List<MemberVehicle> getMemberVehicle(final Long memberId) {
+        return baseMapper.selectList(Wrappers.<MemberVehicle>lambdaQuery()
+                .eq(MemberVehicle::getYn, Boolean.TRUE).eq(MemberVehicle::getMemberId, memberId));
+    }
 }