From aefb4366dcae29239a684f001a3b265336b038d9 Mon Sep 17 00:00:00 2001
From: dzq <dzq@ys.com>
Date: Thu, 5 Jun 2025 17:30:29 +0800
Subject: [PATCH] =?UTF-8?q?fix(shop-goods):=20=E4=BF=AE=E5=A4=8D=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=8F=8A=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96SQL=E6=9F=A5=E8=AF=A2=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 在SearchShopGoodsQuery中增加externalGoodsId的非空判断，避免当参数为null时生成无效查询条件
2. 简化ShopGoodsMapper中的SQL查询字段，使用g.*替代具体字段列表，同时保持聚合字段不变
---
 .../com/agileboot/domain/shop/goods/db/ShopGoodsMapper.java   | 4 ++--
 .../domain/shop/goods/query/SearchShopGoodsQuery.java         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/shop/goods/db/ShopGoodsMapper.java b/agileboot-domain/src/main/java/com/agileboot/domain/shop/goods/db/ShopGoodsMapper.java
index 0007619..963752c 100644
--- a/agileboot-domain/src/main/java/com/agileboot/domain/shop/goods/db/ShopGoodsMapper.java
+++ b/agileboot-domain/src/main/java/com/agileboot/domain/shop/goods/db/ShopGoodsMapper.java
@@ -84,8 +84,8 @@ public interface ShopGoodsMapper extends BaseMapper<ShopGoodsEntity> {
             "WHERE g.deleted = 0 AND g.belong_type = 0 AND sc.deleted = 0 AND sc.shop_id = #{shopId} AND cc.deleted = 0 AND cc.goods_id IS NOT NULL ")
     List<SearchGoodsWithCabinetDO> getGoodsWithCabinetListByShopId(@Param("shopId")Long shopId);
 
-    @Select("SELECT g.goods_id, g.goods_name, g.category_id, g.price, " +
-            "g.stock, g.status, g.auto_approval, g.cover_img, g.goods_detail, g.usage_instruction, SUM(cc.stock) AS total_stock, " +
+    @Select("SELECT g.*, " +
+            "SUM(cc.stock) AS total_stock, " +
             "GROUP_CONCAT(DISTINCT cc.cell_no) AS cell_no_str, " +
             "GROUP_CONCAT(DISTINCT sc.cabinet_name) AS cabinet_name " +
             "FROM shop_goods g " +
diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/shop/goods/query/SearchShopGoodsQuery.java b/agileboot-domain/src/main/java/com/agileboot/domain/shop/goods/query/SearchShopGoodsQuery.java
index a877d43..2651a9f 100644
--- a/agileboot-domain/src/main/java/com/agileboot/domain/shop/goods/query/SearchShopGoodsQuery.java
+++ b/agileboot-domain/src/main/java/com/agileboot/domain/shop/goods/query/SearchShopGoodsQuery.java
@@ -32,7 +32,7 @@ public class SearchShopGoodsQuery<T> extends AbstractPageQuery<T> {
             .ge(minPrice != null, "g.price", minPrice)
             .le(maxPrice != null, "g.price", maxPrice)
             .eq(belongType != null, "g.belong_type", belongType)
-            .eq("g.external_goods_id", externalGoodsId)
+            .eq(externalGoodsId != null, "g.external_goods_id", externalGoodsId)
             .eq("g.deleted", 0)
             .groupBy("g.goods_id");