fix-bug

夏天
1 parent 67c4c5d6
Showing 5 changed files with 63 additions and 0 deletions
fw-valhalla-dao/src/main/java/cn/fw/valhalla/dao/mapper/MemberVehicleMapper.java
fw-valhalla-dao/src/main/resources/mapper/MemberVehicleMapper.xml
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
 package cn.fw.valhalla.dao.mapper;
  
 import cn.fw.valhalla.domain.db.MemberVehicle;
+import cn.fw.valhalla.sdk.result.BasicsCustomerDTO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
  
+import java.util.List;
+
 /**
  * 会员认证车辆
  *
@@ -12,4 +16,12 @@ import org.springframework.stereotype.Repository;
  */
 @Repository
 public interface MemberVehicleMapper extends BaseMapper<MemberVehicle> {
+
+    /**
+     * 关键字全匹配查询
+     *
+     * @param keyword 关键词
+     * @return 车辆档案
+     */
+    List<BasicsCustomerDTO> queryByKeyword(@Param("keyword") String keyword);
 }
@@ -2,4 +2,27 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.fw.valhalla.dao.mapper.MemberVehicleMapper">
  
+    <select
+            id="queryByKeyword"
+            resultType="cn.fw.valhalla.sdk.result.BasicsCustomerDTO"
+    >
+        select
+               t1.id                                                       customer_id,
+               t1.name                                                     customer_name,
+               t1.member_id                                                member_id,
+               t1.cus_type                                                 cus_type,
+               t1.plate_no                                                 plate_no,
+               t1.frame_no                                                 frame_no,
+               concat_ws(' ', t1.brand_name, t1.spec_code) car_name,
+        from member_vehicle t1
+        where t1.yn = 1
+          and (
+                    t1.plate_no = #{keyword}
+                or right(t1.frame_no, 6) = #{keyword}
+                or t1.member_name = #{keyword}
+                or t1.name = #{keyword}
+            )
+    </select>
+
+
 </mapper>
@@ -986,6 +986,16 @@ public class CustomerBizService extends AbstractCustomerService {
     }
  
     public List<BasicsCustomerDTO> queryByKeyword(String keyword, Long groupId) {
+
+        List<BasicsCustomerDTO> list = fromCustomer(keyword,groupId);
+        if(CollectionUtils.isNotEmpty(list)){
+            return list;
+        }
+        return fromVehicle(keyword);
+    }
+
+
+    private List<BasicsCustomerDTO> fromCustomer(String keyword, Long groupId){
         List<BasicsCustomerDTO> list = customerService.queryByKeyword(keyword, groupId);
         for (BasicsCustomerDTO dto : list) {
             UserInfoDTO user = userService.user(dto.getAdviserId());
@@ -1000,6 +1010,9 @@ public class CustomerBizService extends AbstractCustomerService {
         return list;
     }
  
+    private List<BasicsCustomerDTO> fromVehicle(String keyword){
+        return memberVehicleService.queryByKeyword(keyword);
+    }
     public List<MemberVehicleDTO> queryVehicleByMemberId(Long memberId) {
         List<MemberVehicle> memberVehicleList = memberVehicleService.getMemberVehicle(memberId);
         if (CollectionUtils.isEmpty(memberVehicleList)) {
 package cn.fw.valhalla.service.data;
  
 import cn.fw.valhalla.domain.db.MemberVehicle;
+import cn.fw.valhalla.sdk.result.BasicsCustomerDTO;
 import com.baomidou.mybatisplus.extension.service.IService;
  
 import java.util.List;
@@ -28,4 +29,12 @@ public interface MemberVehicleService extends IService&lt;MemberVehicle&gt; {
      * @return 认证车辆
      */
     List<MemberVehicle> getMemberVehicle(Long memberId);
+
+    /**
+     * 关键字全匹配查询
+     *
+     * @param keyword 关键词
+     * @return 认证车辆信息
+     */
+    List<BasicsCustomerDTO> queryByKeyword(String keyword);
 }
@@ -2,6 +2,7 @@ package cn.fw.valhalla.service.data.impl;
  
 import cn.fw.valhalla.dao.mapper.MemberVehicleMapper;
 import cn.fw.valhalla.domain.db.MemberVehicle;
+import cn.fw.valhalla.sdk.result.BasicsCustomerDTO;
 import cn.fw.valhalla.service.data.MemberVehicleService;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -30,4 +31,9 @@ public class MemberVehicleServiceImpl extends ServiceImpl&lt;MemberVehicleMapper, M
         return baseMapper.selectList(Wrappers.<MemberVehicle>lambdaQuery()
                 .eq(MemberVehicle::getYn, Boolean.TRUE).eq(MemberVehicle::getMemberId, memberId));
     }
+
+    @Override
+    public List<BasicsCustomerDTO> queryByKeyword(final String keyword) {
+        return baseMapper.queryByKeyword(keyword);
+    }
 }