From d8cceb58acdc06d96f777213cdd3ecdc908a11b0 Mon Sep 17 00:00:00 2001
From: "kuang.yifei@iwhalecloud.com" <kuang.yifei@iwhalecloud.com>
Date: Fri, 10 Jun 2022 18:20:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=88=E5=82=85=E7=AB=AF=E6=B4=BE=E5=8D=95?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ghy/web/controller/order/OrderController.java     | 3 +++
 .../src/main/resources/mapper/order/OrderDetailMapper.xml      | 2 +-
 ghy-order/src/main/resources/mapper/order/OrderGoodsMapper.xml | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
index 7db1f472..9d66a144 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
@@ -142,9 +142,12 @@ public class OrderController extends BaseController {
 
         // 批量生成订单商品
         request.getGoodsList().forEach(goods -> {
+            // 查询规格信息
+            GoodsStandard goodsStandard = goodsStandardService.selectById(goods.getGoodsStandardId());
             OrderGoods orderGoods = new OrderGoods();
             orderGoods.setGoodsStandardId(goods.getGoodsStandardId());
             orderGoods.setGoodsNum(goods.getNum());
+            orderGoods.setGoodsName(goodsStandard.getGoodsStandardName());
             orderGoods.setOrderDetailId(od.getId());
             orderGoods.setServerGoodsNum(0);
             orderGoodsService.insertOrderGoods(orderGoods);
diff --git a/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml
index 753ad61f..9780a25f 100644
--- a/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml
+++ b/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml
@@ -116,7 +116,7 @@
         create_time
         )VALUES(
         <if test="code != null and code != ''">#{code},</if>
-        <if test="orderMasterId != null and orderMasterId != 0">o#{orderMasterId},</if>
+        <if test="orderMasterId != null and orderMasterId != 0">#{orderMasterId},</if>
         <if test="orderMasterCode != null and orderMasterCode != ''">#{orderMasterCode},</if>
         <if test="customerId != null and customerId != 0">#{customerId},</if>
         <if test="orderType != null">#{orderType},</if>
diff --git a/ghy-order/src/main/resources/mapper/order/OrderGoodsMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderGoodsMapper.xml
index a68db5c5..50191d83 100644
--- a/ghy-order/src/main/resources/mapper/order/OrderGoodsMapper.xml
+++ b/ghy-order/src/main/resources/mapper/order/OrderGoodsMapper.xml
@@ -7,6 +7,7 @@
     <resultMap id="OrderGoodsResult" type="com.ghy.order.domain.OrderGoods">
         <id property="orderGoodsId"             column="order_goods_id"/>
         <result property="orderId"              column="order_id"/>
+        <result property="orderDetailId"              column="order_detail_id"/>
         <result property="goodsStandardId"              column="goods_standard_id"/>
         <result property="goodsName"            column="goods_name"/>
         <result property="goodsNum"             column="goods_num"/>
@@ -44,6 +45,7 @@
             keyProperty="orderGoodsId">
         INSERT INTO order_goods(
             <if test="orderId != null and orderId != 0">order_id,</if>
+            <if test="orderDetailId != null and orderDetailId != 0">order_detail_id,</if>
             <if test="goodsStandardId != null and goodsStandardId != 0">goods_standard_id,</if>
             <if test="goodsName != null and goodsName != ''">goods_name,</if>
             <if test="goodsNum != null">goods_num,</if>
@@ -53,6 +55,7 @@
             create_time
         )VALUES(
             <if test="orderId != null and orderId != 0">#{orderId},</if>
+            <if test="orderDetailId != null and orderDetailId != 0">#{orderDetailId},</if>
             <if test="goodsStandardId != null and goodsStandardId != 0">#{goodsStandardId},</if>
             <if test="goodsName != null and goodsName != ''">#{goodsName},</if>
             <if test="goodsNum != null">#{goodsNum},</if>