diff --git a/cash-api/product-server/src/main/java/com/czg/controller/user/HomeController.java b/cash-api/product-server/src/main/java/com/czg/controller/user/HomeController.java index d2c3a5be3..756da045e 100644 --- a/cash-api/product-server/src/main/java/com/czg/controller/user/HomeController.java +++ b/cash-api/product-server/src/main/java/com/czg/controller/user/HomeController.java @@ -42,7 +42,7 @@ public class HomeController { * @return 商品列表 */ @GetMapping("/product") - public CzgResult> home(String lng, String lat, String address, Integer categoryId, Integer orderType, Integer distanceType) { - return CzgResult.success(homePageService.getProd(lng, lat, address, categoryId, orderType, distanceType)); + public CzgResult> home(String lng, String lat, String address, Integer categoryId, Integer orderType, Integer distanceType, String name) { + return CzgResult.success(homePageService.getProd(lng, lat, address, categoryId, orderType, distanceType, name)); } } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/print/PrinterEditDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/print/PrinterEditDTO.java index 2093073aa..c95aa0fde 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/print/PrinterEditDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/print/PrinterEditDTO.java @@ -42,7 +42,7 @@ public class PrinterEditDTO { /** * 打印机品牌 */ - @Size(min = 1, message = "打印机品牌不为空") +// @Size(min = 1, message = "打印机品牌不为空") private String contentType; diff --git a/cash-common/cash-common-service/src/main/java/com/czg/product/service/HomePageService.java b/cash-common/cash-common-service/src/main/java/com/czg/product/service/HomePageService.java index da2e2af61..0d3f961d5 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/product/service/HomePageService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/product/service/HomePageService.java @@ -10,6 +10,6 @@ import com.mybatisflex.core.paginate.Page; public interface HomePageService { HomePageVO getHomeInfo(); - Page getProd(String lng, String lat, String address, Integer classify, Integer orderType, Integer distanceType); + Page getProd(String lng, String lat, String address, Integer classify, Integer orderType, Integer distanceType, String name); } diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/mapper/ProductMapper.java b/cash-service/product-service/src/main/java/com/czg/service/product/mapper/ProductMapper.java index 38399cbb2..7cf22d6d5 100644 --- a/cash-service/product-service/src/main/java/com/czg/service/product/mapper/ProductMapper.java +++ b/cash-service/product-service/src/main/java/com/czg/service/product/mapper/ProductMapper.java @@ -41,5 +41,5 @@ public interface ProductMapper extends BaseMapper { List selectRecommendProductList(@Param("lng") String lng, @Param("lat") String lat, @Param("address") String address, @Param("classify") Integer classify, @Param("orderType") Integer orderType, - @Param("distanceType") Integer distanceType); + @Param("distanceType") Integer distanceType, @Param("name") String name); } diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/HomePageServiceImpl.java b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/HomePageServiceImpl.java index ec5bfc14b..8573d28ef 100644 --- a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/HomePageServiceImpl.java +++ b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/HomePageServiceImpl.java @@ -106,8 +106,8 @@ public class HomePageServiceImpl implements HomePageService { } @Override - public Page getProd(String lng, String lat, String address, Integer classify, Integer orderType, Integer distanceType) { + public Page getProd(String lng, String lat, String address, Integer classify, Integer orderType, Integer distanceType, String name) { PageHelper.startPage(PageUtil.buildPageHelp()); - return PageUtil.convert(new PageInfo<>(productMapper.selectRecommendProductList(lng, lat, address, classify, orderType, distanceType))); + return PageUtil.convert(new PageInfo<>(productMapper.selectRecommendProductList(lng, lat, address, classify, orderType, distanceType, name))); } } diff --git a/cash-service/product-service/src/main/resources/mapper/ProductMapper.xml b/cash-service/product-service/src/main/resources/mapper/ProductMapper.xml index 51b2bbd7d..63d825875 100644 --- a/cash-service/product-service/src/main/resources/mapper/ProductMapper.xml +++ b/cash-service/product-service/src/main/resources/mapper/ProductMapper.xml @@ -173,6 +173,10 @@ and (b.cities like concat('%', #{address}, '%') or b.districts like concat('%', #{address}, '%')) + + + and a.name like concat('%', #{name}, '%') + and c.category_id = #{classify}