Browse Source

Merge branch 'master' into test

lyhzzz 2 years ago
parent
commit
911712e555

+ 1 - 1
pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.cdf</groupId>
     <artifactId>cdf-gm</artifactId>
-    <version>test</version>
+    <version>2.0.0</version>
     <packaging>jar</packaging>
 
     <parent>

+ 2 - 2
src/main/java/com/cdf/controller/api/ShopApiController.java

@@ -34,11 +34,11 @@ public class ShopApiController {
     private IDeptService deptService;
 
     @GetMapping("/getShopCategory")
-    public ResultData getShopCategory(){
+    public ResultData getShopCategory(@RequestParam(required = false) String sceneNum){
         List<ShopCategory> list = shopCategoryService.list();
         List<ShopCategory> listVo = new ArrayList<>();
         for (ShopCategory category : list) {
-            List<Shop> byCategory = shopService.getByCategory(category.getId());
+            List<Shop> byCategory = shopService.getByCategoryAndSceneNum(category.getId(),sceneNum);
             if(byCategory != null && byCategory.size() >0){
                 listVo.add(category);
             }

+ 2 - 0
src/main/java/com/cdf/service/IShopService.java

@@ -21,4 +21,6 @@ public interface IShopService extends IService<Shop> {
     PageInfo pageList(ShopRequest param);
 
     List<Shop>  getByCategory(Integer categoryId);
+
+    List<Shop> getByCategoryAndSceneNum(Integer categoryId, String sceneNum);
 }

+ 8 - 0
src/main/java/com/cdf/service/impl/ShopServiceImpl.java

@@ -89,4 +89,12 @@ public class ShopServiceImpl extends ServiceImpl<IShopMapper, Shop> implements I
         wrapper.eq(Shop::getCategoryId,categoryId);
         return this.list(wrapper);
     }
+
+    @Override
+    public List<Shop> getByCategoryAndSceneNum(Integer categoryId, String sceneNum) {
+        LambdaQueryWrapper<Shop> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(Shop::getCategoryId,categoryId);
+        wrapper.eq(Shop::getSceneUrl,sceneNum);
+        return this.list(wrapper);
+    }
 }

+ 1 - 1
src/main/resources/logback-spring.xml

@@ -7,7 +7,7 @@
 
 	<contextName>logback</contextName>
 	<!-- name的值是变量的名称,value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义变量后,可以使“${}”来使用变量。 -->
-	<property name="log.path" value="/home/test/logs/cdf" />
+	<property name="log.path" value="/home/logs/cdf" />
 
 	<!-- 彩色日志 -->
 	<!-- 彩色日志依赖的渲染类 -->