From b3c8c4b8a0ed49ff7c69840fa81d4698d4041dcc Mon Sep 17 00:00:00 2001
From: zhangji <1315410739@qq.com>
Date: Wed, 19 Nov 2025 09:50:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B1=87=E6=80=BB=E4=B8=8B=E5=8D=95=E5=8F=AA?=
 =?UTF-8?q?=E5=8F=96=E4=B8=8A=E6=9E=B6=E5=95=86=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dal/mysql/spu/ProductSpuMapper.java       |  2 ++
 .../app/order/AppTradeOrderController.http    | 22 +++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/spu/ProductSpuMapper.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/spu/ProductSpuMapper.java
index fcf27e1..9e71c71 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/spu/ProductSpuMapper.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/spu/ProductSpuMapper.java
@@ -228,6 +228,8 @@ public interface ProductSpuMapper extends BaseMapperX<ProductSpuDO> {
     default List<ProductSpuDO> getSpuListByDeviceid(String deviceId){
         LambdaQueryWrapperX<ProductSpuDO> query = new LambdaQueryWrapperX<ProductSpuDO>()
                 .eqIfPresent(ProductSpuDO::getDeviceId, deviceId);
+        // 上架状态 且有库存
+        query.eq(ProductSpuDO::getStatus, ProductSpuStatusEnum.ENABLE.getStatus());
         return selectList(query);
     }
 
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.http b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.http
index 6881a1e..77dddd5 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.http
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.http
@@ -48,6 +48,28 @@ tenant-id: {{appTenantId}}
   "receiverMobile": "15601691300"
 }
 
+### /trade-order/create 创建汇总商品订单
+POST {{appApi}}/trade/order/create-summary
+Content-Type: application/json
+Authorization: Bearer {{appToken}}
+tenant-id: {{appTenantId}}
+
+{
+  "pointStatus": false,
+  "deliveryType": 3,
+  "pickUpStoreId": 1,
+  "items": [
+    {
+      "barCode": "50000010",
+      "deviceId": "869667070337387",
+      "count": 1
+    }
+  ],
+  "remark": "",
+  "receiverName": "土豆",
+  "receiverMobile": "15601691300"
+}
+
 ### /trade-order/update-paid 更新订单为已支付
 POST {{appApi}}/trade/order/update-paid
 Content-Type: application/json