整合mall的搜索模块

README.md

@@ -25,16 +25,37 @@
 </dependency>
 ```
 
+
++ yml配置
+
+``` yml
+#整合mybatis
+mybatis:
+  #加载Mybatis映射文件
+  mapper-locations:
+    - classpath:mapper/*.xml                      # 调用者Mapper文件路径
+    - classpath:caimei-search-mapper/*Mapper.xml  # 模块服务包Mapper文件路径
+```
+
+
 + 启动类加扫描
 
 ``` xml
-@SpringBootApplication(scanBasePackages = {"调用者controller包路径", "com.caimei.module.service"})
-@MapperScan("com.caimei.module.dao")
+@SpringBootApplication(scanBasePackages = {
+        "com.caimei.module.search.service",  // 模块服务包Service路径
+        "com.caimei.controller.**",          // 调用者Controller路径
+        "com.caimei.service.**"              // 调用者Service路径
+})
+@MapperScan(basePackages = {
+        "com.caimei.module.search.dao",      // 模块服务包Mapper接口路径
+        "com.caimei.mapper.**"               // 调用者Mapper接口路径
+})
 public class DemoApplication {
     public static void main(String[] args) {SpringApplication.run(DemoApplication.class, args);}
 }
 ```
 
+
 + controller类注入
 
 ``` java

caimei-search/pom.xml

@@ -9,7 +9,6 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>caimei-search</artifactId>
-
     <dependencies>
         <dependency>
             <groupId>org.mybatis.spring.boot</groupId>

caimei-search/src/main/java/com/caimei/module/entity/vo/CmMallOrderVo.java

@@ -1,31 +0,0 @@
-package com.caimei.module.entity.vo;
-
-import com.caimei.module.entity.CmOrder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-/**
- * Description
- *
- * @author : Charles
- * @date : 2020/2/27
- */
-@EqualsAndHashCode(callSuper = true)
-@Data
-public class CmMallOrderVo extends CmOrder {
-    /** 订单标识，例#orderID#：#1000# */
-    private String orderMark;
-    /** 订单编号+四位随机数----新的拼接交易号（transactionID+四位随机数） */
-    private String newOrderNo;
-    /** 订单状态备注 */
-    private String statusName;
-    /** 支付总金额 */
-    private BigDecimal receiptAmount;
-    /** 退款总金额 */
-    private BigDecimal returnedPurchaseFee;
-    /** 子订单集合 */
-    private List<CmMallShopOrderVo> shopOrderList;
-}

caimei-search/src/main/java/com/caimei/module/entity/vo/CmMallShopOrderVo.java

@@ -1,30 +0,0 @@
-package com.caimei.module.entity.vo;
-
-import com.caimei.module.entity.CmShopOrder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-/**
- * Description
- *
- * @author : Charles
- * @date : 2020/2/28
- */
-@EqualsAndHashCode(callSuper = true)
-@Data
-public class CmMallShopOrderVo extends CmShopOrder {
-    /** 供应商名称 */
-    private String shopName;
-    /** 供应商logo */
-    private String shopLogo;
-    /** 订单商品数 */
-    private Integer productNum;
-    /** 商品总金额 */
-    private BigDecimal productAmount;
-    /** 订单商品信息 */
-    private List<CmMallOrderProductVo> cmOrderProducts;
-
-}

caimei-search/src/main/java/com/caimei/module/dao/SearchMapper.java → caimei-search/src/main/java/com/caimei/module/search/dao/SearchMapper.java

@@ -1,9 +1,9 @@
-package com.caimei.module.dao;
+package com.caimei.module.search.dao;
 
-import com.caimei.module.entity.vo.CmMallOrderVo;
-import com.caimei.module.entity.vo.CmMallOrganizeProductsVo;
-import com.caimei.module.entity.vo.CmMallProductLadderPriceVo;
-import com.caimei.module.entity.vo.CmMallProductSearchHistoryVo;
+import com.caimei.module.search.entity.vo.CmMallOrderVo;
+import com.caimei.module.search.entity.vo.CmMallOrganizeProductsVo;
+import com.caimei.module.search.entity.vo.CmMallProductLadderPriceVo;
+import com.caimei.module.search.entity.vo.CmMallProductSearchHistoryVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

caimei-search/src/main/java/com/caimei/module/entity/CmMallOrderSearchHistory.java → caimei-search/src/main/java/com/caimei/module/search/entity/CmMallOrderSearchHistory.java

@@ -1,4 +1,4 @@
-package com.caimei.module.entity;
+package com.caimei.module.search.entity;
 
 import java.io.Serializable;
 import java.util.Date;

caimei-search/src/main/java/com/caimei/module/entity/CmMallOrganizeProducts.java → caimei-search/src/main/java/com/caimei/module/search/entity/CmMallOrganizeProducts.java

@@ -1,4 +1,4 @@
-package com.caimei.module.entity;
+package com.caimei.module.search.entity;
 
 import java.io.Serializable;
 import java.math.BigDecimal;

caimei-search/src/main/java/com/caimei/module/entity/CmMallProductLadderPrice.java → caimei-search/src/main/java/com/caimei/module/search/entity/CmMallProductLadderPrice.java

@@ -1,4 +1,4 @@
-package com.caimei.module.entity;
+package com.caimei.module.search.entity;
 
 import java.io.Serializable;
 import java.math.BigDecimal;

caimei-search/src/main/java/com/caimei/module/entity/CmMallProductSearchHistory.java → caimei-search/src/main/java/com/caimei/module/search/entity/CmMallProductSearchHistory.java

@@ -1,4 +1,4 @@
-package com.caimei.module.entity;
+package com.caimei.module.search.entity;
 
 import java.io.Serializable;
 import java.util.Date;

caimei-search/src/main/java/com/caimei/module/entity/CmOrder.java → caimei-search/src/main/java/com/caimei/module/search/entity/CmOrder.java

@@ -1,4 +1,4 @@
-package com.caimei.module.entity;
+package com.caimei.module.search.entity;
 
 import java.io.Serializable;
 import java.math.BigDecimal;

caimei-search/src/main/java/com/caimei/module/entity/CmOrderProduct.java → caimei-search/src/main/java/com/caimei/module/search/entity/CmOrderProduct.java

@@ -1,4 +1,4 @@
-package com.caimei.module.entity;
+package com.caimei.module.search.entity;
 
 import java.io.Serializable;
 import java.math.BigDecimal;

caimei-search/src/main/java/com/caimei/module/entity/CmShopOrder.java → caimei-search/src/main/java/com/caimei/module/search/entity/CmShopOrder.java

@@ -1,4 +1,4 @@
-package com.caimei.module.entity;
+package com.caimei.module.search.entity;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;

caimei-search/src/main/java/com/caimei/module/entity/Product.java → caimei-search/src/main/java/com/caimei/module/search/entity/Product.java

@@ -1,4 +1,4 @@
-package com.caimei.module.entity;
+package com.caimei.module.search.entity;
 
 import java.io.Serializable;
 import java.math.BigDecimal;

caimei-search/src/main/java/com/caimei/module/entity/Productdetailinfo.java → caimei-search/src/main/java/com/caimei/module/search/entity/Productdetailinfo.java

@@ -1,4 +1,4 @@
-package com.caimei.module.entity;
+package com.caimei.module.search.entity;
 
 import java.io.Serializable;
 import lombok.Data;

caimei-search/src/main/java/com/caimei/module/entity/Productimage.java → caimei-search/src/main/java/com/caimei/module/search/entity/Productimage.java

@@ -1,4 +1,4 @@
-package com.caimei.module.entity;
+package com.caimei.module.search.entity;
 
 import java.io.Serializable;
 import lombok.Data;

caimei-search/src/main/java/com/caimei/module/entity/Shop.java → caimei-search/src/main/java/com/caimei/module/search/entity/Shop.java

@@ -1,4 +1,4 @@
-package com.caimei.module.entity;
+package com.caimei.module.search.entity;
 
 import java.io.Serializable;
 import java.math.BigDecimal;

caimei-search/src/main/java/com/caimei/module/entity/vo/CmMallOrderSearchHistoryVo.java → caimei-search/src/main/java/com/caimei/module/search/entity/vo/CmMallOrderSearchHistoryVo.java

@@ -1,6 +1,6 @@
-package com.caimei.module.entity.vo;
+package com.caimei.module.search.entity.vo;
 
-import com.caimei.module.entity.CmMallOrderSearchHistory;
+import com.caimei.module.search.entity.CmMallOrderSearchHistory;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

caimei-search/src/main/java/com/caimei/module/entity/vo/CmMallOrderProductVo.java → caimei-search/src/main/java/com/caimei/module/search/entity/vo/CmMallOrderVo.java

@@ -1,6 +1,6 @@
-package com.caimei.module.entity.vo;
+package com.caimei.module.search.entity.vo;
 
-import com.caimei.module.entity.CmOrderProduct;
+import com.caimei.module.search.entity.CmOrder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -12,6 +12,6 @@ import lombok.EqualsAndHashCode;
  */
 @EqualsAndHashCode(callSuper = true)
 @Data
-public class CmMallOrderProductVo extends CmOrderProduct {
+public class CmMallOrderVo extends CmOrder {
 
 }

caimei-search/src/main/java/com/caimei/module/entity/vo/CmMallOrganizeProductsVo.java → caimei-search/src/main/java/com/caimei/module/search/entity/vo/CmMallOrganizeProductsVo.java

@@ -1,6 +1,6 @@
-package com.caimei.module.entity.vo;
+package com.caimei.module.search.entity.vo;
 
-import com.caimei.module.entity.CmMallOrganizeProducts;
+import com.caimei.module.search.entity.CmMallOrganizeProducts;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

caimei-search/src/main/java/com/caimei/module/entity/vo/CmMallProductDetailInfoVo.java → caimei-search/src/main/java/com/caimei/module/search/entity/vo/CmMallProductDetailInfoVo.java

@@ -1,6 +1,6 @@
-package com.caimei.module.entity.vo;
+package com.caimei.module.search.entity.vo;
 
-import com.caimei.module.entity.Productdetailinfo;
+import com.caimei.module.search.entity.Productdetailinfo;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

caimei-search/src/main/java/com/caimei/module/entity/vo/CmMallProductImageVo.java → caimei-search/src/main/java/com/caimei/module/search/entity/vo/CmMallProductImageVo.java

@@ -1,6 +1,6 @@
-package com.caimei.module.entity.vo;
+package com.caimei.module.search.entity.vo;
 
-import com.caimei.module.entity.Productimage;
+import com.caimei.module.search.entity.Productimage;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

caimei-search/src/main/java/com/caimei/module/entity/vo/CmMallProductLadderPriceVo.java → caimei-search/src/main/java/com/caimei/module/search/entity/vo/CmMallProductLadderPriceVo.java

@@ -1,6 +1,6 @@
-package com.caimei.module.entity.vo;
+package com.caimei.module.search.entity.vo;
 
-import com.caimei.module.entity.CmMallProductLadderPrice;
+import com.caimei.module.search.entity.CmMallProductLadderPrice;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

caimei-search/src/main/java/com/caimei/module/entity/vo/CmMallProductSearchHistoryVo.java → caimei-search/src/main/java/com/caimei/module/search/entity/vo/CmMallProductSearchHistoryVo.java

@@ -1,6 +1,6 @@
-package com.caimei.module.entity.vo;
+package com.caimei.module.search.entity.vo;
 
-import com.caimei.module.entity.CmMallProductSearchHistory;
+import com.caimei.module.search.entity.CmMallProductSearchHistory;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

caimei-search/src/main/java/com/caimei/module/entity/vo/CmMallProductVo.java → caimei-search/src/main/java/com/caimei/module/search/entity/vo/CmMallProductVo.java

@@ -1,6 +1,6 @@
-package com.caimei.module.entity.vo;
+package com.caimei.module.search.entity.vo;
 
-import com.caimei.module.entity.Product;
+import com.caimei.module.search.entity.Product;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

caimei-search/src/main/java/com/caimei/module/entity/vo/CmMallShopVo.java → caimei-search/src/main/java/com/caimei/module/search/entity/vo/CmMallShopVo.java

@@ -1,6 +1,6 @@
-package com.caimei.module.entity.vo;
+package com.caimei.module.search.entity.vo;
 
-import com.caimei.module.entity.Shop;
+import com.caimei.module.search.entity.Shop;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

caimei-search/src/main/java/com/caimei/module/service/SearchService.java → caimei-search/src/main/java/com/caimei/module/search/service/SearchService.java

@@ -1,9 +1,9 @@
-package com.caimei.module.service;
+package com.caimei.module.search.service;
 
-import com.caimei.module.entity.vo.CmMallOrganizeProductsVo;
-import com.caimei.module.entity.vo.CmMallProductLadderPriceVo;
-import com.caimei.module.entity.vo.CmMallProductSearchHistoryVo;
-import com.caimei.module.entity.vo.CmMallOrderVo;
+import com.caimei.module.search.entity.vo.CmMallOrganizeProductsVo;
+import com.caimei.module.search.entity.vo.CmMallProductLadderPriceVo;
+import com.caimei.module.search.entity.vo.CmMallProductSearchHistoryVo;
+import com.caimei.module.search.entity.vo.CmMallOrderVo;
 
 import java.util.List;
 

caimei-search/src/main/java/com/caimei/module/service/impl/SearchServiceImpl.java → caimei-search/src/main/java/com/caimei/module/search/service/impl/SearchServiceImpl.java

@@ -1,11 +1,11 @@
-package com.caimei.module.service.impl;
-
-import com.caimei.module.dao.SearchMapper;
-import com.caimei.module.entity.vo.CmMallOrderVo;
-import com.caimei.module.entity.vo.CmMallOrganizeProductsVo;
-import com.caimei.module.entity.vo.CmMallProductLadderPriceVo;
-import com.caimei.module.entity.vo.CmMallProductSearchHistoryVo;
-import com.caimei.module.service.SearchService;
+package com.caimei.module.search.service.impl;
+
+import com.caimei.module.search.dao.SearchMapper;
+import com.caimei.module.search.entity.vo.CmMallOrderVo;
+import com.caimei.module.search.entity.vo.CmMallOrganizeProductsVo;
+import com.caimei.module.search.entity.vo.CmMallProductLadderPriceVo;
+import com.caimei.module.search.entity.vo.CmMallProductSearchHistoryVo;
+import com.caimei.module.search.service.SearchService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

caimei-search/src/main/resources/caimei-search-mapper/SearchMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.caimei.module.dao.SearchMapper">
-  <select id="searchProduct" resultType="com.caimei.module.entity.vo.CmMallOrganizeProductsVo">
+<mapper namespace="com.caimei.module.search.dao.SearchMapper">
+  <select id="searchProduct" resultType="com.caimei.module.search.entity.vo.CmMallOrganizeProductsVo">
     SELECT
       cmop.*,
       p.mainImage,
@@ -19,7 +19,7 @@
       AND p.productID IS NOT NULL
       AND p.name LIKE CONCAT('%',#{searchWord,jdbcType=VARCHAR},'%')
   </select>
-  <select id="findProductRecord" resultType="com.caimei.module.entity.vo.CmMallProductSearchHistoryVo">
+  <select id="findProductRecord" resultType="com.caimei.module.search.entity.vo.CmMallProductSearchHistoryVo">
     SELECT
       *
     FROM
@@ -30,7 +30,7 @@
       AND delFlag = '0'
     ORDER BY searchDate DESC
   </select>
-  <select id="findLadderPrice" resultType="com.caimei.module.entity.vo.CmMallProductLadderPriceVo">
+  <select id="findLadderPrice" resultType="com.caimei.module.search.entity.vo.CmMallProductLadderPriceVo">
     SELECT
       *
     FROM
@@ -43,7 +43,7 @@
     LIMIT
       1
   </select>
-  <select id="findAllProductRecord" resultType="com.caimei.module.entity.vo.CmMallProductSearchHistoryVo">
+  <select id="findAllProductRecord" resultType="com.caimei.module.search.entity.vo.CmMallProductSearchHistoryVo">
     SELECT
       *
     FROM
@@ -54,7 +54,7 @@
       AND searchWord = #{searchWord,jdbcType=VARCHAR}
       AND delFlag = '0'
   </select>
-  <select id="findAllOrderRecord" resultType="com.caimei.module.entity.vo.CmMallProductSearchHistoryVo">
+  <select id="findAllOrderRecord" resultType="com.caimei.module.search.entity.vo.CmMallProductSearchHistoryVo">
     SELECT
       *
     FROM
@@ -65,7 +65,7 @@
       AND searchWord = #{searchWord,jdbcType=VARCHAR}
       AND delFlag = '0'
   </select>
-  <select id="searchOrder" resultType="com.caimei.module.entity.vo.CmMallOrderVo">
+  <select id="searchOrder" resultType="com.caimei.module.search.entity.vo.CmMallOrderVo">
     SELECT
       co.*
     FROM
@@ -81,7 +81,7 @@
     ORDER BY
       co.orderTime DESC
   </select>
-  <select id="findOrderRecord" resultType="com.caimei.module.entity.vo.CmMallProductSearchHistoryVo">
+  <select id="findOrderRecord" resultType="com.caimei.module.search.entity.vo.CmMallProductSearchHistoryVo">
     SELECT
       *
     FROM
@@ -114,13 +114,13 @@
       AND searchWord = #{searchWord,jdbcType=VARCHAR}
       AND delFlag = '0'
   </update>
-  <insert id="saveProductRecord" keyColumn="id" keyProperty="id" parameterType="com.caimei.module.entity.vo.CmMallProductSearchHistoryVo" useGeneratedKeys="true">
+  <insert id="saveProductRecord" keyColumn="id" keyProperty="id" parameterType="com.caimei.module.search.entity.vo.CmMallProductSearchHistoryVo" useGeneratedKeys="true">
     insert into cm_mall_product_search_history (organizeID,openID,searchWord,
                                                 searchDate,delFlag)
     values (#{organizeID,jdbcType=INTEGER},#{openID,jdbcType=VARCHAR},#{searchWord,jdbcType=VARCHAR},
             #{searchDate,jdbcType=TIMESTAMP},#{delFlag,jdbcType=VARCHAR})
   </insert>
-  <insert id="saveOrderRecord" keyColumn="id" keyProperty="id" parameterType="com.caimei.module.entity.vo.CmMallOrderSearchHistoryVo" useGeneratedKeys="true">
+  <insert id="saveOrderRecord" keyColumn="id" keyProperty="id" parameterType="com.caimei.module.search.entity.vo.CmMallOrderSearchHistoryVo" useGeneratedKeys="true">
     insert into cm_mall_order_search_history (organizeID,openID,searchWord,
                                               searchDate,delFlag)
     values (#{organizeID,jdbcType=INTEGER},#{openID,jdbcType=VARCHAR},#{searchWord,jdbcType=VARCHAR},