整合搜索模块

pom.xml

@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.2.4.RELEASE</version>
+        <relativePath/> <!-- lookup parent from repository -->
+    </parent>
 
     <groupId>com.caimei</groupId>
     <artifactId>caimei-mall</artifactId>
@@ -14,13 +19,19 @@
         <maven.compiler.target>1.8</maven.compiler.target>
     </properties>
 
-    <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.5.9.RELEASE</version>
-    </parent>
-
     <dependencies>
+
+        <dependency>
+            <groupId>com.caimei.module</groupId>
+            <artifactId>caimei-search</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
+            <version>1.9.4</version>
+        </dependency>
+
         <!--spring Boot原始依赖-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -36,14 +47,12 @@
         <dependency>
             <groupId>org.mybatis.spring.boot</groupId>
             <artifactId>mybatis-spring-boot-starter</artifactId>
-            <version>1.3.1</version>
+            <version>2.1.1</version>
         </dependency>
-
-        <!-- mysql的依赖 -->
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.21</version>
+            <version>8.0.18</version>
         </dependency>
 
         <dependency>
@@ -135,7 +144,6 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>1.5.2.RELEASE</version>
                 <configuration>
                     <mainClass>com.caimei.StartApplication</mainClass><!--springboot启动类目录-->
                 </configuration>
@@ -152,4 +160,4 @@
     </build>
 
 
-</project>
+</project>

src/main/java/com/caimei/StartApplication.java

@@ -1,15 +1,15 @@
 package com.caimei;
 
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
-@SpringBootApplication
-/*@MapperScan("com.caimei.*")
-@ComponentScan(basePackages = {"com.caimei.*"})*/
+@SpringBootApplication(scanBasePackages = {"com.caimei.module.service", "com.caimei.controller.**", "com.caimei.service.**"})
+@MapperScan(basePackages = {"com.caimei.module.dao", "com.caimei.mapper.**"})
 public class StartApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(StartApplication.class, args);
     }
 
-}
+}

src/main/java/com/caimei/controller/search/SearchController.java

@@ -3,8 +3,11 @@ package com.caimei.controller.search;
 import com.caimei.controller.user.LoginController;
 import com.caimei.entity.*;
 import com.caimei.mapper.order.OrderMapper;
-import com.caimei.service.search.SearchService;
+
+import com.caimei.module.entity.vo.*;
+import com.caimei.module.service.SearchService;
 import com.caimei.utils.AppUtils;
+import com.caimei.utils.CopyUtil;
 import com.github.pagehelper.PageHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -12,7 +15,9 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -25,7 +30,7 @@ public class SearchController {
     private SearchService searchService;
     @Autowired
     private LoginController loginController;
-    @Autowired
+    @Resource
     private OrderMapper orderMapper;
     @Value("${miniprogram.domain}")
     private String domain;
@@ -38,11 +43,11 @@ public class SearchController {
     public CmWxJsonModel searchProduct(Integer organizeID, String searchWord, String code, Integer index,
                                        Integer pageSize, HttpServletRequest request) {
         CmWxJsonModel model = CmWxJsonModel.newInstance();
-        if (searchWord == null || "".equals(searchWord)) return model.error("请输入商品关键词");
+        if (searchWord == null || "".equals(searchWord)) { return model.error("请输入商品关键词"); }
         CmWxJsonModel jsonModel = loginController.login(code, request, organizeID);
-        String openID = (String) jsonModel.getData();
+        String openID = ("1".equals(jsonModel.getCode())) ? (String)jsonModel.getData() : null;
         //查询历史记录是否存在
-        CmMallProductSearchHistory productSearchHistory = searchService.findAllProductRecord(organizeID, searchWord, openID);
+        CmMallProductSearchHistoryVo productSearchHistory = searchService.findAllProductRecord(organizeID, searchWord, openID);
         if (productSearchHistory == null) {
             //保存并删除大于10条的历史记录
             searchService.saveProductRecord(organizeID, searchWord, openID);
@@ -50,20 +55,20 @@ public class SearchController {
         } else {
             searchService.updateProductRecord(organizeID, searchWord, openID);
         }
-        if (index == null) index = 0;
-        if (pageSize == null) pageSize = 10;
+        index = (index != null) ? index : 0;
+        pageSize = (pageSize != null) ? pageSize : 10;
         PageHelper.startPage(index, pageSize);
-        List<CmMallOrganizeProducts> list = searchService.searchProduct(organizeID, searchWord);
-        for (CmMallOrganizeProducts products : list) {
+        List<CmMallOrganizeProductsVo> list = searchService.searchProduct(organizeID, searchWord);
+        for (CmMallOrganizeProductsVo products : list) {
             products.setMainImage(AppUtils.getImageURL("product", products.getMainImage(), 0, domain));
             //是否启用阶梯价格
             if (products.getLadderPriceFlag().equals("1")) {
-                CmMallProductLadderPrice ladderPrice = searchService.findLadderPrice(products.getId());
+                CmMallProductLadderPriceVo ladderPrice = searchService.findLadderPrice(products.getId().longValue());
                 products.setRetailPrice(ladderPrice.getBuyPrice());
             }
         }
-        CmMallPage<CmMallOrganizeProducts> productsPage = new CmMallPage<>(list);
-        return model.success(productsPage);
+        CmMallPage<CmMallOrganizeProductsVo> productsPage = new CmMallPage<>(list);
+        return CmWxJsonModel.newInstance().success(productsPage);
     }
 
     /**
@@ -74,7 +79,7 @@ public class SearchController {
     public CmWxJsonModel productRecord(Integer organizeID, String code, HttpServletRequest request) {
         CmWxJsonModel jsonModel = loginController.login(code, request, organizeID);
         String openID = (String) jsonModel.getData();
-        List<CmMallProductSearchHistory> historyList = searchService.findProductRecord(organizeID, openID);
+        List<CmMallProductSearchHistoryVo> historyList = searchService.findProductRecord(organizeID, openID);
         return CmWxJsonModel.newInstance().success(historyList);
     }
 
@@ -101,13 +106,13 @@ public class SearchController {
     @ResponseBody
     @RequestMapping("/order")
     public CmWxJsonModel searchOrder(Integer organizeID, String searchWord, String code, Integer index,
-                                     Integer pageSize, Integer userID, HttpServletRequest request) {
+                                     Integer pageSize, Long userID, HttpServletRequest request) {
         CmWxJsonModel model = CmWxJsonModel.newInstance();
-        if (searchWord == null || "".equals(searchWord)) return model.error("请输入商品关键词");
+        if (searchWord == null || "".equals(searchWord)) { return model.error("请输入商品关键词"); }
         CmWxJsonModel jsonModel = loginController.login(code, request, organizeID);
-        String openID = (String) jsonModel.getData();
+        String openID = ("1".equals(jsonModel.getCode())) ? (String)jsonModel.getData() : null;
         //查询历史记录是否存在
-        CmMallProductSearchHistory orderSearchHistory = searchService.findAllOrderRecord(organizeID, searchWord, openID);
+        CmMallProductSearchHistoryVo orderSearchHistory = searchService.findAllOrderRecord(organizeID, searchWord, openID);
         if (orderSearchHistory == null) {
             //保存并删除大于10条的历史记录
             searchService.saveOrderRecord(organizeID, searchWord, openID);
@@ -115,14 +120,14 @@ public class SearchController {
         } else {
             searchService.updateOrderRecord(organizeID, searchWord, openID);
         }
-        if (index == null) index = 0;
-        if (pageSize == null) pageSize = 10;
+        index = (index != null) ? index : 0;
+        pageSize = (pageSize != null) ? pageSize : 10;
         PageHelper.startPage(index, pageSize);
-        List<CmMallOrder> orderList = searchService.searchOrder(organizeID, searchWord, userID);
-        for (CmMallOrder order : orderList) {
+        List<CmMallOrderVo> orderList = searchService.searchOrder(organizeID, searchWord, userID);
+        for (CmMallOrderVo order : orderList) {
             //111,待付待收待发
             if (order.getStatus().equals(11) && order.getPayStatus().equals("1")) {
-                order.setStatus(111);
+                order.setStatus("111");
             }
             String[] ShopOrderIDs = {};
             if (order.getShopOrderIDs().contains(",")) {
@@ -131,17 +136,24 @@ public class SearchController {
                 ShopOrderIDs = new String[]{order.getShopOrderIDs()};
             }
             List<CmMallShopOrder> shopOrderList = orderMapper.findAllShopOrder(ShopOrderIDs);
+            List<CmMallShopOrderVo> shopOrderVoList = new ArrayList<>();
             for (CmMallShopOrder shopOrder : shopOrderList) {
+                CmMallShopOrderVo shopOrderVo = new CmMallShopOrderVo();
+                CopyUtil.copyProperties(shopOrderVo, shopOrder);
                 List<CmMallOrderProduct> orderProductList = orderMapper.findOrderProduct(shopOrder.getShopOrderID());
+                List<CmMallOrderProductVo> orderProductVoList = new ArrayList<>();
                 for (CmMallOrderProduct orderProduct : orderProductList) {
-                    orderProduct.setProductImage(AppUtils.getImageURL("product", orderProduct.getProductImage(), 0, domain));
+                    CmMallOrderProductVo orderProductVo = new CmMallOrderProductVo();
+                    CopyUtil.copyProperties(orderProductVo, orderProduct);
+                    orderProductVo.setProductImage(AppUtils.getImageURL("product", orderProduct.getProductImage(), 0, domain));
+                    orderProductVoList.add(orderProductVo);
                 }
-                shopOrder.setCmOrderProducts(orderProductList);
-                shopOrder.setShopLogo(AppUtils.getImageURL("shopLogo", shopOrder.getShopLogo(), 0, domain));
+                shopOrderVo.setCmOrderProducts(orderProductVoList);
+                shopOrderVo.setShopLogo(AppUtils.getImageURL("shopLogo", shopOrder.getShopLogo(), 0, domain));
             }
-            order.setShopOrderList(shopOrderList);
+            order.setShopOrderList(shopOrderVoList);
         }
-        CmMallPage<CmMallOrder> orderPage = new CmMallPage<>(orderList);
+        CmMallPage<CmMallOrderVo> orderPage = new CmMallPage<>(orderList);
         return model.success(orderPage);
     }
 
@@ -153,7 +165,7 @@ public class SearchController {
     public CmWxJsonModel orderRecord(Integer organizeID, String code, HttpServletRequest request) {
         CmWxJsonModel jsonModel = loginController.login(code, request, organizeID);
         String openID = (String) jsonModel.getData();
-        List<CmMallProductSearchHistory> historyList = searchService.findOrderRecord(organizeID, openID);
+        List<CmMallProductSearchHistoryVo> historyList = searchService.findOrderRecord(organizeID, openID);
         return CmWxJsonModel.newInstance().success(historyList);
     }
 

src/main/java/com/caimei/mapper/order/BpUserInfoMapper.java

@@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Param;
  * @author Lijun
  * @create 2019-12-20
  **/
-@Mapper
+// @Mapper
 public interface BpUserInfoMapper {
 
     CmMallBpOrderUserInfo getUserInfo(@Param("orderId") Integer orderId);

src/main/java/com/caimei/mapper/order/CmMallShopOrderMapper.java

@@ -7,7 +7,7 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 import java.util.Map;
 
-@Mapper
+// @Mapper
 public interface CmMallShopOrderMapper {
 
     List<CmMallShopOrder> findList(CmMallShopOrder cmMallShopOrder);

src/main/java/com/caimei/mapper/order/OrderMapper.java

@@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 import java.util.Map;
 
-@Mapper
+// @Mapper
 public interface OrderMapper {
 
     int insert(CmMallOrder cmMallOrder);

src/main/java/com/caimei/mapper/order/OrderProductMapper.java

@@ -7,7 +7,7 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 
-@Mapper
+// @Mapper
 public interface OrderProductMapper {
 
     CmMallOrderProduct get(@Param("orderProductID") Integer orderProductID);

src/main/java/com/caimei/mapper/products/DetailsMapper.java

@@ -5,7 +5,7 @@ import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
 
-@Mapper
+// @Mapper
 public interface DetailsMapper {
     CmMallOrganizeProducts findProduct(Integer id);
 

src/main/java/com/caimei/mapper/products/HomePageMapper.java

@@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
 
-@Mapper
+// @Mapper
 public interface HomePageMapper {
 
     List<CmMallProductsClassify> findClassify(Integer organizeID);

src/main/java/com/caimei/mapper/products/OrganizeProductsMapper.java

@@ -6,7 +6,7 @@ import com.caimei.entity.CmMallProduct;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-@Mapper
+// @Mapper
 public interface OrganizeProductsMapper {
     CmMallOrganizeProducts selectProductById(@Param("id") Integer id);
 
@@ -15,4 +15,4 @@ public interface OrganizeProductsMapper {
     int insert(CmMallOrderProduct cmMallOrderProduct);
 
     int update(CmMallOrderProduct cmMallOrderProduct);
-}
+}

src/main/java/com/caimei/mapper/products/ShoppingMapper.java

@@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
-@Mapper
+// @Mapper
 public interface ShoppingMapper {
 
     List<CmMallShop> findAllShop(Integer userID);

src/main/java/com/caimei/mapper/search/SearchMapper.java

@@ -1,43 +0,0 @@
-package com.caimei.mapper.search;
-
-import com.caimei.entity.CmMallOrder;
-import com.caimei.entity.CmMallOrganizeProducts;
-import com.caimei.entity.CmMallProductLadderPrice;
-import com.caimei.entity.CmMallProductSearchHistory;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-@Mapper
-public interface SearchMapper {
-    List<CmMallOrganizeProducts> searchProduct(@Param("organizeID") Integer organizeID, @Param("searchWord") String searchWord);
-
-    void deleteProductRecord(@Param("organizeID") Integer organizeID, @Param("openID") String openID);
-
-    void saveProductRecord(CmMallProductSearchHistory productSearchHistory);
-
-    CmMallProductLadderPrice findLadderPrice(Integer id);
-
-    List<CmMallProductSearchHistory> findProductRecord(@Param("organizeID") Integer organizeID, @Param("openID") String openID);
-
-    void deleteRecord(@Param("organizeID") Integer organizeID, @Param("openID") String openID);
-
-    CmMallProductSearchHistory findAllProductRecord(@Param("organizeID") Integer organizeID, @Param("openID") String openID, @Param("searchWord") String searchWord);
-
-    void updateProductRecord(CmMallProductSearchHistory productSearchHistory);
-
-    CmMallProductSearchHistory findAllOrderRecord(@Param("organizeID") Integer organizeID, @Param("openID") String openID, @Param("searchWord") String searchWord);
-
-    void saveOrderRecord(CmMallProductSearchHistory orderSearchHistory);
-
-    void deleteOrderRecord(@Param("organizeID") Integer organizeID, @Param("openID") String openID);
-
-    void updateOrderRecord(CmMallProductSearchHistory orderSearchHistory);
-
-    List<CmMallOrder> searchOrder(@Param("organizeID") Integer organizeID, @Param("searchWord") String searchWord, @Param("userID") Integer userID);
-
-    List<CmMallProductSearchHistory> findOrderRecord(@Param("organizeID") Integer organizeID, @Param("openID") String openID);
-
-    void deleteSearchHistory(@Param("organizeID") Integer organizeID, @Param("openID") String openID);
-}

src/main/java/com/caimei/mapper/user/CmMallAddressMapper.java

@@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
-@Mapper
+// @Mapper
 public interface CmMallAddressMapper {
 
     List<CmMallAddress> findByUserId(Integer userID);

src/main/java/com/caimei/mapper/user/CmMallUserMapper.java

@@ -5,7 +5,7 @@ import com.caimei.entity.CmMallUser;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-@Mapper
+// @Mapper
 public interface CmMallUserMapper {
 
 	/**
@@ -40,4 +40,4 @@ public interface CmMallUserMapper {
 	 * @return
 	 */
 	int updateBalanceRecord(CmMallUserBalanceRecord cmMallUserBalanceRecord);
-}
+}

src/main/java/com/caimei/mapper/user/LoginMapper.java

@@ -4,7 +4,7 @@ import com.caimei.entity.CmMallOperationUser;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-@Mapper
+// @Mapper
 public interface LoginMapper {
 
     CmMallOperationUser doLogin(@Param("openid") String openid, @Param("userOrganizeID") Integer userOrganizeID);

src/main/java/com/caimei/mapper/user/PersonalMapper.java

@@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
-@Mapper
+// @Mapper
 public interface PersonalMapper {
 
     CmMallClub myCentre(CmMallOperationUser operationUser);

src/main/java/com/caimei/service/products/impl/HomePageServiceImpl.java

@@ -3,8 +3,9 @@ package com.caimei.service.products.impl;
 import com.caimei.entity.*;
 import com.caimei.mapper.products.HomePageMapper;
 import com.caimei.entity.CmMallOrganizeProducts;
+import com.caimei.module.entity.vo.CmMallProductLadderPriceVo;
+import com.caimei.module.service.SearchService;
 import com.caimei.service.products.HomePageService;
-import com.caimei.service.search.SearchService;
 import com.caimei.utils.AppUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -38,8 +39,8 @@ public class HomePageServiceImpl implements HomePageService {
             product.setMainImage(AppUtils.getImageURL("product", product.getMainImage(), 0, domain));
             //是否启用阶梯价格
             if (product.getLadderPriceFlag().equals("1")) {
-                CmMallProductLadderPrice ladderPrice = searchService.findLadderPrice(product.getId());
-                product.setRetailPrice(ladderPrice.getBuyPrice());
+                CmMallProductLadderPriceVo ladderPrice = searchService.findLadderPrice(product.getId().longValue());
+                product.setRetailPrice(ladderPrice.getBuyPrice().doubleValue());
             }
         }
         //购物车数量
@@ -65,8 +66,8 @@ public class HomePageServiceImpl implements HomePageService {
             products.setMainImage(AppUtils.getImageURL("product", products.getMainImage(), 0, domain));
             //是否启用阶梯价格
             if (products.getLadderPriceFlag().equals("1")) {
-                CmMallProductLadderPrice ladderPrice = searchService.findLadderPrice(products.getId());
-                products.setRetailPrice(ladderPrice.getBuyPrice());
+                CmMallProductLadderPriceVo ladderPrice = searchService.findLadderPrice(products.getId().longValue());
+                products.setRetailPrice(ladderPrice.getBuyPrice().doubleValue());
             }
         }
         return classify;
@@ -79,8 +80,8 @@ public class HomePageServiceImpl implements HomePageService {
             products.setMainImage(AppUtils.getImageURL("product", products.getMainImage(), 0, domain));
             //是否启用阶梯价格
             if (products.getLadderPriceFlag().equals("1")) {
-                CmMallProductLadderPrice ladderPrice = searchService.findLadderPrice(products.getId());
-                products.setRetailPrice(ladderPrice.getBuyPrice());
+                CmMallProductLadderPriceVo ladderPrice = searchService.findLadderPrice(products.getId().longValue());
+                products.setRetailPrice(ladderPrice.getBuyPrice().doubleValue());
             }
         }
         return preferred;

src/main/java/com/caimei/service/search/SearchService.java

@@ -1,40 +0,0 @@
-package com.caimei.service.search;
-
-import com.caimei.entity.CmMallOrder;
-import com.caimei.entity.CmMallOrganizeProducts;
-import com.caimei.entity.CmMallProductLadderPrice;
-import com.caimei.entity.CmMallProductSearchHistory;
-
-import java.util.List;
-
-public interface SearchService {
-    List<CmMallOrganizeProducts> searchProduct(Integer organizeID, String searchWord);
-
-    void deleteProductRecord(Integer organizeID, String openID);
-
-    void saveProductRecord(Integer organizeID, String searchWord, String openID);
-
-    List<CmMallProductSearchHistory> findProductRecord(Integer organizeID, String openID);
-
-    CmMallProductLadderPrice findLadderPrice(Integer id);
-
-    void deleteRecord(Integer organizeID, String openID);
-
-    CmMallProductSearchHistory findAllProductRecord(Integer organizeID, String searchWord, String openID);
-
-    void updateProductRecord(Integer organizeID, String searchWord, String openID);
-
-    CmMallProductSearchHistory findAllOrderRecord(Integer organizeID, String searchWord, String openID);
-
-    void saveOrderRecord(Integer organizeID, String searchWord, String openID);
-
-    void deleteOrderRecord(Integer organizeID, String openID);
-
-    void updateOrderRecord(Integer organizeID, String searchWord, String openID);
-
-    List<CmMallOrder> searchOrder(Integer organizeID, String searchWord, Integer userID);
-
-    List<CmMallProductSearchHistory> findOrderRecord(Integer organizeID, String openID);
-
-    void deleteSearchHistory(Integer organizeID, String openID);
-}

src/main/java/com/caimei/service/search/impl/SearchServiceImpl.java

@@ -1,118 +0,0 @@
-package com.caimei.service.search.impl;
-
-import com.caimei.entity.CmMallOrder;
-import com.caimei.entity.CmMallOrganizeProducts;
-import com.caimei.entity.CmMallProductLadderPrice;
-import com.caimei.entity.CmMallProductSearchHistory;
-import com.caimei.mapper.search.SearchMapper;
-import com.caimei.service.search.SearchService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.Date;
-import java.util.List;
-
-@Service
-public class SearchServiceImpl implements SearchService {
-    @Autowired
-    private SearchMapper searchMapper;
-
-    @Override
-    public List<CmMallOrganizeProducts> searchProduct(Integer organizeID, String searchWord) {
-        List<CmMallOrganizeProducts> productsList = searchMapper.searchProduct(organizeID, searchWord);
-        return productsList;
-    }
-
-    @Override
-    public void deleteProductRecord(Integer organizeID, String openID) {
-        searchMapper.deleteProductRecord(organizeID, openID);
-    }
-
-    @Override
-    public void saveProductRecord(Integer organizeID, String searchWord, String openID) {
-        CmMallProductSearchHistory productSearchHistory = new CmMallProductSearchHistory();
-        productSearchHistory.setOpenID(openID);
-        productSearchHistory.setDelFlag("0");
-        productSearchHistory.setOrganizeID(organizeID);
-        productSearchHistory.setSearchDate(new Date());
-        productSearchHistory.setSearchWord(searchWord);
-        searchMapper.saveProductRecord(productSearchHistory);
-    }
-
-    @Override
-    public List<CmMallProductSearchHistory> findProductRecord(Integer organizeID, String openID) {
-        return searchMapper.findProductRecord(organizeID, openID);
-    }
-
-    @Override
-    public CmMallProductLadderPrice findLadderPrice(Integer id) {
-        return searchMapper.findLadderPrice(id);
-    }
-
-    @Override
-    public void deleteRecord(Integer organizeID, String openID) {
-        searchMapper.deleteRecord(organizeID, openID);
-    }
-
-    @Override
-    public CmMallProductSearchHistory findAllProductRecord(Integer organizeID, String searchWord, String openID) {
-        return searchMapper.findAllProductRecord(organizeID, openID, searchWord);
-    }
-
-    @Override
-    public void updateProductRecord(Integer organizeID, String searchWord, String openID) {
-        CmMallProductSearchHistory productSearchHistory = new CmMallProductSearchHistory();
-        productSearchHistory.setOpenID(openID);
-        productSearchHistory.setOrganizeID(organizeID);
-        productSearchHistory.setSearchDate(new Date());
-        productSearchHistory.setSearchWord(searchWord);
-        searchMapper.updateProductRecord(productSearchHistory);
-    }
-
-    @Override
-    public CmMallProductSearchHistory findAllOrderRecord(Integer organizeID, String searchWord, String openID) {
-        return searchMapper.findAllOrderRecord(organizeID, openID, searchWord);
-    }
-
-    @Override
-    public void saveOrderRecord(Integer organizeID, String searchWord, String openID) {
-        CmMallProductSearchHistory orderSearchHistory = new CmMallProductSearchHistory();
-        orderSearchHistory.setOpenID(openID);
-        orderSearchHistory.setDelFlag("0");
-        orderSearchHistory.setOrganizeID(organizeID);
-        orderSearchHistory.setSearchDate(new Date());
-        orderSearchHistory.setSearchWord(searchWord);
-        searchMapper.saveOrderRecord(orderSearchHistory);
-    }
-
-    @Override
-    public void deleteOrderRecord(Integer organizeID, String openID) {
-        searchMapper.deleteOrderRecord(organizeID, openID);
-    }
-
-    @Override
-    public void updateOrderRecord(Integer organizeID, String searchWord, String openID) {
-        CmMallProductSearchHistory orderSearchHistory = new CmMallProductSearchHistory();
-        orderSearchHistory.setOpenID(openID);
-        orderSearchHistory.setOrganizeID(organizeID);
-        orderSearchHistory.setSearchDate(new Date());
-        orderSearchHistory.setSearchWord(searchWord);
-        searchMapper.updateOrderRecord(orderSearchHistory);
-    }
-
-    @Override
-    public List<CmMallOrder> searchOrder(Integer organizeID, String searchWord, Integer userID) {
-        List<CmMallOrder> orderList = searchMapper.searchOrder(organizeID, searchWord, userID);
-        return orderList;
-    }
-
-    @Override
-    public List<CmMallProductSearchHistory> findOrderRecord(Integer organizeID, String openID) {
-        return searchMapper.findOrderRecord(organizeID, openID);
-    }
-
-    @Override
-    public void deleteSearchHistory(Integer organizeID, String openID) {
-        searchMapper.deleteSearchHistory(organizeID, openID);
-    }
-}

src/main/java/com/caimei/utils/CopyUtil.java

@@ -0,0 +1,97 @@
+package com.caimei.utils;
+
+import java.beans.PropertyDescriptor;
+import java.util.Collection;
+import org.apache.commons.beanutils.PropertyUtils;
+
+/**
+ * Description
+ *
+ * @author : Charles
+ * @date : 2020/2/28
+ */
+public class CopyUtil {
+    /**
+     * Copy properties of orig to dest Exception the Entity and Collection Type
+     *
+     * @param dest
+     * @param orig
+     * @return the dest bean
+     */
+    public static Object copyProperties(Object dest, Object orig) {
+        if (dest == null || orig == null) {
+            return dest;
+        }
+
+        PropertyDescriptor[] destDesc = PropertyUtils.getPropertyDescriptors(dest);
+        try {
+            for (int i = 0; i < destDesc.length; i++) {
+                Class destType = destDesc[i].getPropertyType();
+                Class origType = PropertyUtils.getPropertyType(orig, destDesc[i].getName());
+                if (destType != null && destType.equals(origType) && !destType.equals(Class.class)) {
+                    if (!Collection.class.isAssignableFrom(origType)) {
+                        try {
+                            Object value = PropertyUtils.getProperty(orig, destDesc[i].getName());
+                            PropertyUtils.setProperty(dest, destDesc[i].getName(), value);
+                        } catch (Exception ex) {}
+                    }
+                }
+            }
+
+            return dest;
+        } catch (Exception ex) {
+            // throw new CopyException(ex);
+            return dest;
+        }
+    }
+
+    /**   */
+    /**
+     * Copy properties of orig to dest Exception the Entity and Collection Type
+     *
+     * @param dest
+     * @param orig
+     * @param ignores
+     * @return the dest bean
+     */
+    public static Object copyProperties(Object dest, Object orig, String[] ignores) {
+        if (dest == null || orig == null) {
+            return dest;
+        }
+
+        PropertyDescriptor[] destDesc = PropertyUtils.getPropertyDescriptors(dest);
+        try {
+            for (int i = 0; i < destDesc.length; i++) {
+                if (contains(ignores, destDesc[i].getName())) {
+                    continue;
+                }
+
+                Class destType = destDesc[i].getPropertyType();
+                Class origType = PropertyUtils.getPropertyType(orig, destDesc[i].getName());
+                if (destType != null && destType.equals(origType) && !destType.equals(Class.class)) {
+                    if (!Collection.class.isAssignableFrom(origType)) {
+                        Object value = PropertyUtils.getProperty(orig, destDesc[i].getName());
+                        PropertyUtils.setProperty(dest, destDesc[i].getName(), value);
+                    }
+                }
+            }
+
+            return dest;
+        } catch (Exception ex) {
+            // throw new CopyException(ex);
+            return dest;
+        }
+    }
+
+    static boolean contains(String[] ignores, String name) {
+        boolean ignored = false;
+        for (int j = 0; ignores != null && j < ignores.length; j++) {
+            if (ignores[j].equals(name)) {
+                ignored = true;
+                break;
+            }
+        }
+
+        return ignored;
+    }
+}

src/main/resources/dev/application-dev.yml

@@ -6,7 +6,6 @@ spring:
 
     #数据源连接--start
   datasource:
-    driverClassName: com.mysql.jdbc.Driver
     url: jdbc:mysql://119.29.0.46:3306/caimei_dev?characterEncoding=UTF8
     username: general
     password: 6#xsI%b4o@5c3RoE
@@ -24,7 +23,9 @@ spring:
 #整合mybatis
 mybatis:
   #加载Mybatis映射文件
-  mapper-locations: classpath:mapper/*Mapper.xml
+  mapper-locations:
+    - classpath:mapper/*.xml
+    - classpath:caimei-search-mapper/*Mapper.xml
   #pojo别名扫描包
   type-aliases-package: com.caimei.entity
 
@@ -37,8 +38,9 @@ pagehelper:
 
 #日志配置
 logging:
-  file: E:/caimei-mall/catalina.out
-  level: debug
+  path: E:/caimei-mall/catalina.out
+  level:
+    root: info
 
 miniprogram:
   #邀请码有效时长  /天

src/main/resources/mapper/SearchMapper.xml

@@ -1,221 +0,0 @@
-<?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.mapper.search.SearchMapper">
-    <select id="searchProduct" resultType="com.caimei.entity.CmMallOrganizeProducts">
-        SELECT
-          cmop.*,
-          p.mainImage,
-          p.name,
-          p.unit
-        FROM
-          cm_mall_organize_products cmop
-          LEFT JOIN product p ON cmop.productID = p.productID
-        WHERE
-          cmop.organizeID = #{organizeID}
-          AND cmop.validFlag = '1'
-          AND cmop.delFlag = '0'
-          AND p.name LIKE CONCAT('%', #{searchWord}, '%')
-          AND p.productID IS NOT NULL
-    </select>
-
-    <delete id="deleteProductRecord">
-        DELETE FROM
-          cm_mall_product_search_history
-        WHERE
-          organizeID = #{organizeID}
-          AND openID = #{openID}
-          AND delFlag = '0'
-          AND id NOT IN (
-            SELECT
-              psh.id
-            FROM
-              (
-                SELECT
-                  id
-                FROM
-                  cm_mall_product_search_history
-                WHERE
-                  organizeID = #{organizeID}
-                  AND openID = #{openID}
-                  AND delFlag = '0'
-                ORDER BY
-                  searchDate DESC
-                LIMIT
-                  10
-              ) AS psh
-          )
-    </delete>
-
-    <insert id="saveProductRecord" parameterType="com.caimei.entity.CmMallProductSearchHistory">
-        INSERT INTO cm_mall_product_search_history (
-          organizeID, openID, searchWord, searchDate,
-          delFlag
-        )
-        VALUES
-          (
-            #{organizeID}, #{openID}, #{searchWord}, #{searchDate},
-            #{delFlag}
-          )
-    </insert>
-
-    <select id="findLadderPrice" resultType="com.caimei.entity.CmMallProductLadderPrice">
-        SELECT
-          *
-        FROM
-          cm_mall_product_ladder_price
-        WHERE
-          productId = #{id}
-          AND delFlag = '0'
-        ORDER BY
-          ladderNum DESC
-        LIMIT
-          1
-    </select>
-
-    <select id="findProductRecord" resultType="com.caimei.entity.CmMallProductSearchHistory">
-        SELECT
-          *
-        FROM
-          cm_mall_product_search_history
-        WHERE
-          organizeID = #{organizeID}
-          AND openID = #{openID}
-          AND delFlag = '0'
-          ORDER BY searchDate DESC
-    </select>
-
-    <delete id="deleteRecord">
-        DELETE FROM
-          cm_mall_product_search_history
-        WHERE
-          openID = #{openID}
-          AND organizeID = #{organizeID}
-    </delete>
-
-    <select id="findAllProductRecord" resultType="com.caimei.entity.CmMallProductSearchHistory">
-        SELECT
-          *
-        FROM
-          cm_mall_product_search_history
-        WHERE
-          organizeID = #{organizeID}
-          AND openID = #{openID}
-          AND searchWord = #{searchWord}
-          AND delFlag = '0'
-    </select>
-
-    <update id="updateProductRecord">
-        UPDATE
-          cm_mall_product_search_history
-        SET
-          searchDate = #{searchDate}
-        WHERE
-          openID = #{openID}
-          AND organizeID = #{organizeID}
-          AND searchWord = #{searchWord}
-          AND delFlag = '0'
-    </update>
-
-    <select id="findAllOrderRecord" resultType="com.caimei.entity.CmMallProductSearchHistory">
-        SELECT
-          *
-        FROM
-          cm_mall_order_search_history
-        WHERE
-          organizeID = #{organizeID}
-          AND openID = #{openID}
-          AND searchWord = #{searchWord}
-          AND delFlag = '0'
-    </select>
-
-    <insert id="saveOrderRecord">
-        INSERT INTO cm_mall_order_search_history (
-          organizeID, openID, searchWord, searchDate,
-          delFlag
-        )
-        VALUES
-          (
-            #{organizeID}, #{openID}, #{searchWord}, #{searchDate},
-            #{delFlag}
-          )
-    </insert>
-
-    <delete id="deleteOrderRecord">
-       DELETE FROM
-          cm_mall_order_search_history
-        WHERE
-          organizeID = #{organizeID}
-          AND openID = #{openID}
-          AND delFlag = '0'
-          AND id NOT IN (
-            SELECT
-              osh.id
-            FROM
-              (
-                SELECT
-                  id
-                FROM
-                  cm_mall_order_search_history
-                WHERE
-                  organizeID = #{organizeID}
-                  AND openID = #{openID}
-                  AND delFlag = '0'
-                ORDER BY
-                  searchDate DESC
-                LIMIT
-                  10
-              ) AS osh
-          )
-    </delete>
-
-    <update id="updateOrderRecord">
-        UPDATE
-          cm_mall_order_search_history
-        SET
-          searchDate = #{searchDate}
-        WHERE
-          openID = #{openID}
-          AND organizeID = #{organizeID}
-          AND searchWord = #{searchWord}
-          AND delFlag = '0'
-    </update>
-
-    <select id="searchOrder" resultType="com.caimei.entity.CmMallOrder">
-        SELECT
-          co.*
-        FROM
-          cm_order co
-          LEFT JOIN cm_order_product cop ON co.orderID = cop.orderID
-        WHERE
-          co.userID = #{userID}
-          AND co.delFlag = '0'
-          AND co.organizeID = #{organizeID}
-          AND cop.name LIKE CONCAT('%', #{searchWord}, '%')
-        GROUP BY
-          co.orderID
-        ORDER BY
-          co.orderTime DESC
-    </select>
-
-    <select id="findOrderRecord" resultType="com.caimei.entity.CmMallProductSearchHistory">
-        SELECT
-          *
-        FROM
-          cm_mall_order_search_history
-        WHERE
-          organizeID = #{organizeID}
-          AND openID = #{openID}
-          AND delFlag = '0'
-          ORDER BY searchDate DESC
-    </select>
-
-    <delete id="deleteSearchHistory">
-        DELETE FROM
-          cm_mall_order_search_history
-        WHERE
-          openID = #{openID}
-          AND organizeID = #{organizeID}
-    </delete>
-</mapper>

src/main/resources/prod/application-prod.yml

@@ -6,7 +6,6 @@ spring:
 
     #数据源连接--start
   datasource:
-    driverClassName: com.mysql.jdbc.Driver
     url: jdbc:mysql://10.104.172.219:3306/caimei?characterEncoding=UTF8
     username: developer
     password: diKtPYZ'wToI&9#L
@@ -25,7 +24,9 @@ spring:
 #整合mybatis
 mybatis:
   #加载Mybatis映射文件
-  mapper-locations: classpath:mapper/*Mapper.xml
+  mapper-locations:
+    - classpath:mapper/*.xml
+    - classpath:caimei-search-mapper/*Mapper.xml
   #pojo别名扫描包
   type-aliases-package: com.caimei.entity
 
@@ -39,8 +40,9 @@ pagehelper:
 
 #日志配置
 logging:
-  file: /mnt/newdatadrive/data/runtime/tomcat-instance/caimei-mall/catalina.out
-  level: debug
+  path: /mnt/newdatadrive/data/runtime/tomcat-instance/caimei-mall/catalina.out
+  level:
+    root: info
 
 miniprogram:
   #邀请码有效时长  /天

src/main/resources/test/application-test.yml

@@ -6,7 +6,6 @@ spring:
 
     #数据源连接--start
   datasource:
-    driverClassName: com.mysql.jdbc.Driver
     url: jdbc:mysql://10.104.50.235:3306/caimei?characterEncoding=UTF8
     username: developer
     password: J5p";~OVazNl%y)?
@@ -25,7 +24,9 @@ spring:
 #整合mybatis
 mybatis:
   #加载Mybatis映射文件
-  mapper-locations: classpath:mapper/*Mapper.xml
+  mapper-locations:
+    - classpath:mapper/*.xml
+    - classpath:caimei-search-mapper/*Mapper.xml
   #pojo别名扫描包
   type-aliases-package: com.caimei.entity
 
@@ -38,8 +39,9 @@ pagehelper:
 
 #日志配置
 logging:
-  file: /mnt/newdatadrive/data/runtime/tomcat-instance/caimei-mall/catalina.out
-  level: debug
+  path: /mnt/newdatadrive/data/runtime/tomcat-instance/caimei-mall/catalina.out
+  level:
+    root: info
 
 miniprogram:
   #邀请码有效时长  /天
@@ -50,4 +52,4 @@ miniprogram:
   AppSecret1: 1c371e72aba710949dd74bb184a3a774
   #采美组织
   AppId2: wxf3cd4ae0cdd11c36
-  AppSecret2: 9bdb37d28c5e74ad3694c09c205e9bd2
+  AppSecret2: 9bdb37d28c5e74ad3694c09c205e9bd2