diff --git a/cash-api/account-server/src/main/resources/logback.xml b/cash-api/account-server/src/main/resources/logback.xml index a8784ad1..e57ecdeb 100644 --- a/cash-api/account-server/src/main/resources/logback.xml +++ b/cash-api/account-server/src/main/resources/logback.xml @@ -14,10 +14,10 @@ - logs/logback.log + logs/account/logback.log - logs/history/%d{yyyy-MM-dd}/logback.%i.log.gz + logs/account/history/%d{yyyy-MM-dd}/logback.%i.log.gz 30 20MB diff --git a/cash-api/order-server/src/main/resources/logback.xml b/cash-api/order-server/src/main/resources/logback.xml index d0010bda..00f674de 100644 --- a/cash-api/order-server/src/main/resources/logback.xml +++ b/cash-api/order-server/src/main/resources/logback.xml @@ -14,10 +14,10 @@ - logs/logback.log + logs/order/logback.log - logs/history/%d{yyyy-MM-dd}/logback.%i.log.gz + logs/order/history/%d{yyyy-MM-dd}/logback.%i.log.gz 30 20MB 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 47cf634c..756da045 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 @@ -37,12 +37,12 @@ public class HomeController { * @param lat 经度 * @param address 城市 * @param categoryId 分类 0双人餐 1饮品明细 2咖啡饮品 - * @param orderType 排序规则 0离我最近 1销量优先 2价格优先 + * @param orderType 排序规则 0离我最近 1销量优先 2价格优先 3上新 * @param distanceType 1000m 2000m * @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-api/product-server/src/main/resources/logback.xml b/cash-api/product-server/src/main/resources/logback.xml index a547cd0f..6daa8cd4 100644 --- a/cash-api/product-server/src/main/resources/logback.xml +++ b/cash-api/product-server/src/main/resources/logback.xml @@ -14,10 +14,10 @@ - logs/logback.log + logs/product/logback.log - logs/history/%d{yyyy-MM-dd}/logback.%i.log.gz + logs/product/history/%d{yyyy-MM-dd}/logback.%i.log.gz 30 20MB diff --git a/cash-api/system-server/src/main/resources/logback.xml b/cash-api/system-server/src/main/resources/logback.xml index 50b084d7..a1d04ed9 100644 --- a/cash-api/system-server/src/main/resources/logback.xml +++ b/cash-api/system-server/src/main/resources/logback.xml @@ -14,10 +14,10 @@ - logs/logback.log + logs/system/logback.log - logs/history/%d{yyyy-MM-dd}/logback.%i.log.gz + logs/system/history/%d{yyyy-MM-dd}/logback.%i.log.gz 30 20MB diff --git a/cash-common/cash-common-sa-token/src/main/java/com/czg/config/SaTokenConfigure.java b/cash-common/cash-common-sa-token/src/main/java/com/czg/config/SaTokenConfigure.java index 1920d714..e9433df2 100644 --- a/cash-common/cash-common-sa-token/src/main/java/com/czg/config/SaTokenConfigure.java +++ b/cash-common/cash-common-sa-token/src/main/java/com/czg/config/SaTokenConfigure.java @@ -63,7 +63,7 @@ public class SaTokenConfigure implements WebMvcConfigurer { // 重置根路径，防止satoken切割根路径导致匹配不到路径 ApplicationInfo.routePrefix = ""; - SaRouter.match("/user/**").notMatch("/user/login", "/user/test", "/user/geo/**", "/user/home/**") + SaRouter.match("/user/**").notMatch("/user/login", "/user/test", "/user/geo/**", "/user/home/**", "/user/home/**", "/user/dict/**") .notMatch("/pay/**") .notMatch("/notify/**") .check(r -> MyStpLogic.CLIENT_LOGIC.checkLogin()) 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 2093073a..c95aa0fd 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 da2e2af6..0d3f961d 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 38399cbb..7cf22d6d 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 ec5bfc14..8573d28e 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 a707adbd..ef911ea5 100644 --- a/cash-service/product-service/src/main/resources/mapper/ProductMapper.xml +++ b/cash-service/product-service/src/main/resources/mapper/ProductMapper.xml @@ -173,8 +173,12 @@ and (b.cities like concat('%', #{address}, '%') or b.districts like concat('%', #{address}, '%')) + + + and c.name like concat('%', #{name}, '%') + - and c.category_id = #{classify} + and c.group_category_id = #{classify} and ST_Distance_Sphere(POINT(b.lng, b.lat), POINT(#{lng}, #{lat})) <= #{distanceType} @@ -190,6 +194,10 @@ ORDER BY a.sale_price + + ORDER BY c.create_time desc + + update tb_product