From 4655eb4df0d53a2c73238ae89bd534f22b0bbb3e Mon Sep 17 00:00:00 2001
From: dzq <dzq@ys.com>
Date: Fri, 9 May 2025 16:05:52 +0800
Subject: [PATCH] =?UTF-8?q?refactor(shop):=20=E7=A7=BB=E9=99=A4=E5=86=97?=
 =?UTF-8?q?=E4=BD=99=E6=97=A5=E5=BF=97=E5=B9=B6=E4=BC=98=E5=8C=96=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除 `ShopController` 和 `ShopGoodsServiceImpl` 中的冗余日志记录
- 在 `ShopOrderMapper` 中添加 `cabinet_cell` 表的连接以优化订单查询
- 在 `SearchShopOrderQuery` 中添加 `cabinetId` 查询条件以支持按柜子ID筛选订单
---
 .../main/java/com/agileboot/api/controller/ShopController.java  | 1 -
 .../agileboot/domain/shop/goods/db/ShopGoodsServiceImpl.java    | 1 -
 .../com/agileboot/domain/shop/order/db/ShopOrderMapper.java     | 1 +
 .../agileboot/domain/shop/order/query/SearchShopOrderQuery.java | 2 ++
 4 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/agileboot-api/src/main/java/com/agileboot/api/controller/ShopController.java b/agileboot-api/src/main/java/com/agileboot/api/controller/ShopController.java
index 6214e3c..17bde5c 100644
--- a/agileboot-api/src/main/java/com/agileboot/api/controller/ShopController.java
+++ b/agileboot-api/src/main/java/com/agileboot/api/controller/ShopController.java
@@ -40,7 +40,6 @@ public class ShopController {
 
     @GetMapping("/goods")
     public ResponseDTO<ShopGoodsResponse> getShopGoodsInfo(@RequestParam(required = false) Long shopId) {
-        log.info("getShopGoodsInfo shopId: {}", shopId);
         /*// 获取商品列表
         List<ShopGoodsEntity> goodsList = goodsApplicationService.getGoodsAll();
         goodsList.forEach(goods -> {
diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/shop/goods/db/ShopGoodsServiceImpl.java b/agileboot-domain/src/main/java/com/agileboot/domain/shop/goods/db/ShopGoodsServiceImpl.java
index d1c198a..b1496aa 100644
--- a/agileboot-domain/src/main/java/com/agileboot/domain/shop/goods/db/ShopGoodsServiceImpl.java
+++ b/agileboot-domain/src/main/java/com/agileboot/domain/shop/goods/db/ShopGoodsServiceImpl.java
@@ -37,7 +37,6 @@ public class ShopGoodsServiceImpl extends ServiceImpl<ShopGoodsMapper, ShopGoods
         if (shopId == null) {
             return baseMapper.getGoodsWithCabinetList();
         } else {
-            log.info("getGoodsWithCabinetList shopId: {}", shopId);
             return baseMapper.getGoodsWithCabinetListByShopId(shopId);
         }
     }
diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/db/ShopOrderMapper.java b/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/db/ShopOrderMapper.java
index 935d341..ffd5693 100644
--- a/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/db/ShopOrderMapper.java
+++ b/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/db/ShopOrderMapper.java
@@ -23,6 +23,7 @@ public interface ShopOrderMapper extends BaseMapper<ShopOrderEntity> {
         "GROUP_CONCAT(DISTINCT og.cover_img) AS coverImgs " +
         "FROM shop_order o " +
         "LEFT JOIN shop_order_goods og ON o.order_id = og.order_id AND og.deleted = 0 " +
+        "LEFT JOIN cabinet_cell cc ON cc.cell_id = og.cell_id " +
         "${ew.customSqlSegment}")
     Page<OrderWithGoodsDTO> getOrderList(
         Page<OrderWithGoodsDTO> page,
diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/query/SearchShopOrderQuery.java b/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/query/SearchShopOrderQuery.java
index adef8a7..66d5fdf 100644
--- a/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/query/SearchShopOrderQuery.java
+++ b/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/query/SearchShopOrderQuery.java
@@ -14,6 +14,7 @@ public class SearchShopOrderQuery<T> extends AbstractPageQuery<T> {
 
     private Long orderId;
     private Long cellId;
+    private Long cabinetId;
     private Integer status;
     private Integer payStatus;
     private Date startTime;
@@ -28,6 +29,7 @@ public class SearchShopOrderQuery<T> extends AbstractPageQuery<T> {
         queryWrapper
             .eq(orderId != null, "o.order_id", orderId)
             .eq(cellId != null, "og.cell_id", cellId)
+            .eq(cabinetId != null, "cc.cabinet_id", cabinetId)
             .eq(status != null, "o.status", status)
             .eq(payStatus != null, "o.pay_status", payStatus)
             .eq(StrUtil.isNotEmpty(paymentMethod), "o.payment_method", paymentMethod)