From fb716982f1e9a2240ae711536c33d1d1a7bd3cb2 Mon Sep 17 00:00:00 2001
From: wxy <you@example.com>
Date: Wed, 3 Apr 2024 15:35:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../muyu/product/controller/ArgumentController.java   | 11 ++++++++---
 .../java/com/muyu/product/mapper/ArgumentMapper.java  |  3 ++-
 .../com/muyu/product/service/ArgumentService.java     |  2 +-
 .../product/service/impl/ArgumentServiceImpl.java     |  4 ++--
 .../main/resources/mapper/product/ArgumentMapper.xml  |  4 ++--
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ArgumentController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ArgumentController.java
index 245aba8..63ed98b 100644
--- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ArgumentController.java
+++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ArgumentController.java
@@ -7,8 +7,10 @@ import com.muyu.product.domain.DTO.Services;
 import com.muyu.product.domain.vo.ProductCategoryVo;
 import com.muyu.product.service.ArgumentService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -29,20 +31,23 @@ public class ArgumentController {
     @Autowired
     private ArgumentService argumentService;
 
-    @GetMapping("/queryBrand")
-    public AjaxResult queryBrand(){
-        List<Brand>list = argumentService.queryBrand();
+    @ApiOperation("品牌下拉框查询")
+    @GetMapping("/queryBrand/{brandName}")
+    public AjaxResult queryBrand(@PathVariable String brandName){
+        List<Brand>list = argumentService.queryBrand(brandName);
         return success(list);
     }
 
 
     @GetMapping("/queryService")
+    @ApiOperation("查询服务")
     public AjaxResult queryService(){
         List<Services>list=argumentService.queryService();
         return success(list);
     }
 
     @GetMapping("/queryCategory")
+    @ApiOperation("分类查询")
     public R<List<ProductCategoryVo>>queryCategory(){
         return R.ok(argumentService.queryCategory());
     }
diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/ArgumentMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/ArgumentMapper.java
index fe23fd3..c3c0370 100644
--- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/ArgumentMapper.java
+++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/ArgumentMapper.java
@@ -4,6 +4,7 @@ import com.muyu.product.domain.DTO.Brand;
 import com.muyu.product.domain.DTO.Category;
 import com.muyu.product.domain.DTO.Services;
 import org.apache.ibatis.annotations.Mapper;
+import org.springframework.web.bind.annotation.PathVariable;
 
 import java.util.List;
 
@@ -13,7 +14,7 @@ import java.util.List;
  */
 @Mapper
 public interface ArgumentMapper {
-    List<Brand> queryBrand();
+    List<Brand> queryBrand(@PathVariable String brandName);
 
     List<Services> queryService();
 
diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ArgumentService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ArgumentService.java
index 50482e8..a13bae6 100644
--- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ArgumentService.java
+++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ArgumentService.java
@@ -11,7 +11,7 @@ import java.util.List;
  * @Date: 2024/3/29 17:05
  */
 public interface ArgumentService {
-    List<Brand> queryBrand();
+    List<Brand> queryBrand(String brandName);
 
     List<Services> queryService();
 
diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ArgumentServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ArgumentServiceImpl.java
index 9f1b6a8..4bd5687 100644
--- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ArgumentServiceImpl.java
+++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ArgumentServiceImpl.java
@@ -23,8 +23,8 @@ public class ArgumentServiceImpl implements ArgumentService {
     @Autowired
     private ArgumentMapper argumentMapper;
     @Override
-    public List<Brand> queryBrand() {
-        return argumentMapper.queryBrand();
+    public List<Brand> queryBrand(String brandName) {
+        return argumentMapper.queryBrand(brandName);
     }
 
     @Override
diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/ArgumentMapper.xml b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/ArgumentMapper.xml
index 490e12d..5da7efb 100644
--- a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/ArgumentMapper.xml
+++ b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/ArgumentMapper.xml
@@ -22,11 +22,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="queryService" resultType="com.muyu.product.domain.DTO.Services">
         select id,service_name from
-            t_product_service
+            t_product_service where id_delete =1
     </select>
 
     <select id="queryCategory" resultType="com.muyu.product.domain.DTO.Category">
-        select id,parent_id,category_name  from t_product_category
+        select id,parent_id,category_name  from t_product_category where id_delete =1
     </select>