From 0c1e10969fa0f41a83773d4499b65b3ef8797bac Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Wed, 6 Mar 2024 15:02:05 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20spu=E7=95=8C=E9=9D=A2=E6=A8=A1=E7=B3=8A?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../serve/modules/goods/controller/GoodsSkuController.java | 7 ++++++-
 .../java/com/qs/serve/modules/goods/entity/GoodsSku.java   | 7 +++++++
 src/main/resources/mapper/goods/GoodsSkuMapper.xml         | 4 ++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuController.java b/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuController.java
index d59ef15c..8250e150 100644
--- a/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuController.java
+++ b/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuController.java
@@ -38,6 +38,7 @@ import org.springframework.web.bind.annotation.*;
 import com.qs.serve.modules.goods.entity.GoodsSku;
 import com.qs.serve.modules.goods.service.GoodsSkuService;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 import java.util.ArrayList;
 import java.util.List;
@@ -89,8 +90,12 @@ public class GoodsSkuController {
      * @return
      */
     @GetMapping("/page")
-    public R<PageVo<GoodSkuVo>> getPage(GoodsSku param){
+    public R<PageVo<GoodSkuVo>> getPage(GoodsSku param, HttpServletRequest request){
         PageUtil.startPage();
+
+        String spuName = request.getParameter("name");
+        param.setSpuName(spuName);
+
         List<GoodSkuVo> list = goodsSkuService.selectSkuVo(param);
         return R.byPageHelperList(list);
     }
diff --git a/src/main/java/com/qs/serve/modules/goods/entity/GoodsSku.java b/src/main/java/com/qs/serve/modules/goods/entity/GoodsSku.java
index 6397fbfd..5da72878 100644
--- a/src/main/java/com/qs/serve/modules/goods/entity/GoodsSku.java
+++ b/src/main/java/com/qs/serve/modules/goods/entity/GoodsSku.java
@@ -185,5 +185,12 @@ public class GoodsSku implements Serializable {
      */
     @TableField(exist = false)
     private String spuCode;
+
+    /**
+     * spu名称
+     */
+    @TableField(exist = false)
+    private String spuName;
+
 }
 
diff --git a/src/main/resources/mapper/goods/GoodsSkuMapper.xml b/src/main/resources/mapper/goods/GoodsSkuMapper.xml
index 53e49299..90065dc7 100644
--- a/src/main/resources/mapper/goods/GoodsSkuMapper.xml
+++ b/src/main/resources/mapper/goods/GoodsSkuMapper.xml
@@ -130,7 +130,11 @@
             <if test="query.skuCode != null and query.skuCode != ''"> and `goods_sku`.`sku_code` like concat('%',#{query.skuCode},'%') </if>
             <if test="query.skuAddCode != null and query.skuAddCode != ''"> and `goods_sku`.`sku_add_code` like concat('%',#{query.skuAddCode},'%') </if>
             <if test="query.spuCode != null and query.spuCode != ''"> and `goods_spu`.`spu_code` like concat('%',#{query.spuCode},'%') </if>
+            <if test="query.spuName != null and query.spuName != ''"> and `goods_spu`.`name` like concat('%',#{query.spuName},'%') </if>
             <if test="query.skuName != null and query.skuName != ''"> and `goods_sku`.`sku_name` like concat('%',#{query.skuName},'%') </if>
+            <if test="query.tasteVal != null and query.tasteVal != ''"> and `goods_sku`.`taste_val` like concat('%',#{query.tasteVal},'%') </if>
+            <if test="query.wrapVal != null and query.wrapVal != ''"> and `goods_sku`.`wrap_val` like concat('%',#{query.wrapVal},'%') </if>
+            <if test="query.specInfos != null and query.specInfos != ''"> and `goods_sku`.`spec_infos` like concat('%',#{query.specInfos},'%') </if>
             <if test="query.spuId != null"> and `goods_sku`.`spu_id` = #{query.spuId}</if>
             <if test="query.salesPrice != null"> and `goods_sku`.`sales_price` = #{query.salesPrice}</if>
             <if test="query.marketPrice != null"> and `goods_sku`.`market_price` = #{query.marketPrice}</if>