From 80f27bbec834c0dc4e4f3a9d7948ea18b8f20fd9 Mon Sep 17 00:00:00 2001
From: cabbage <281119120@qq.com>
Date: Wed, 27 Aug 2025 09:05:59 +0800
Subject: [PATCH] =?UTF-8?q?##=20=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=B7=BB=E5=8A=A0=E5=95=86=E5=93=81=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sale/order/controller/manager/SaOrderController.java   | 2 ++
 .../main/java/com/hzs/sale/order/vo/WaresOrderInfoVo.java  | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/manager/SaOrderController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/manager/SaOrderController.java
index bbb1ee90..92488697 100644
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/manager/SaOrderController.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/manager/SaOrderController.java
@@ -301,6 +301,8 @@ public class SaOrderController extends ParentOrderController {
             if (StringUtils.isNotBlank(waresOrderVo.getOperateScope())) {
                 waresOrderVo.setOperateScope(ESupplyWay.getLabelByVal(Integer.parseInt(waresOrderVo.getOperateScope())));
             }
+            // 商品类型
+            waresOrderVo.setIsMakerGiftVal(EWaresType.getLabelByValue(waresOrderVo.getIsMakerGift()));
             // 发货类型
             waresOrderVo.setShippingChannelStr(EShippingChannel.getLabelByValue(waresOrderVo.getShippingChannel()));
         }
diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/vo/WaresOrderInfoVo.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/vo/WaresOrderInfoVo.java
index 01d11bef..a76c9ab2 100644
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/vo/WaresOrderInfoVo.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/vo/WaresOrderInfoVo.java
@@ -292,6 +292,13 @@ public class WaresOrderInfoVo implements Serializable {
      */
     private Integer systemType;
 
+    /**
+     * 商品类型
+     */
+    private Integer isMakerGift;
+    @Excel(name = "商品类型")
+    private String isMakerGiftVal;
+
     /**
      * 创建时间
      */