From 08b50407ddac194b9adc9d3b63dd5f0dd2e31c44 Mon Sep 17 00:00:00 2001
From: Hawking <hhawking@qq.com>
Date: Thu, 18 May 2023 16:33:33 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E2=80=9C?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ghy/web/controller/order/OrderGoodsController.java    | 1 +
 ghy-admin/src/main/resources/templates/order/goods.html       | 4 ++--
 .../src/main/resources/mapper/order/OrderGoodsMapper.xml      | 3 +++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderGoodsController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderGoodsController.java
index 61783a32..00e9bd66 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderGoodsController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderGoodsController.java
@@ -39,6 +39,7 @@ public class OrderGoodsController extends BaseController {
     @GetMapping()
     public String orderGoods(Long orderId, ModelMap mmap) {
         OrderMaster orderMaster = orderMasterService.selectById(orderId);
+        mmap.put("orderId", orderId);
         mmap.put("orderMaster", orderMaster);
         return prefix;
     }
diff --git a/ghy-admin/src/main/resources/templates/order/goods.html b/ghy-admin/src/main/resources/templates/order/goods.html
index 375afb01..916f29a7 100644
--- a/ghy-admin/src/main/resources/templates/order/goods.html
+++ b/ghy-admin/src/main/resources/templates/order/goods.html
@@ -13,7 +13,7 @@
         <div class="row">
             <div class="col-sm-12 search-collapse">
                 <form id="order-goods-form">
-                    <input type="hidden" id="orderId" name="orderId" th:value="${orderMaster.id}">
+<!--                    <input type="hidden" id="orderId" name="orderId" th:value="${orderMaster.id}">-->
                 </form>
             </div>
             <div class="col-sm-12 select-table table-striped">
@@ -50,7 +50,7 @@
 
     function queryOrderGoodsList() {
         var options = {
-            url: prefix + "/list",
+            url: prefix + "/list?orderDetailId=" + orderId,
             modalName: "订单商品",
             search: false,
             showSearch: false,
diff --git a/ghy-order/src/main/resources/mapper/order/OrderGoodsMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderGoodsMapper.xml
index 3c3bacf8..6206b606 100644
--- a/ghy-order/src/main/resources/mapper/order/OrderGoodsMapper.xml
+++ b/ghy-order/src/main/resources/mapper/order/OrderGoodsMapper.xml
@@ -72,6 +72,9 @@
             <if test="orderId != null and orderId != 0">
                 AND order_id = #{orderId}
             </if>
+            <if test="orderDetailId != null and orderDetailId != 0">
+                AND order_detail_id = #{orderDetailId}
+            </if>
             <if test="goodsStandardId != null and goodsStandardId != 0">
                 AND goods_standard_id = #{goodsStandardId}
             </if>