From 7fc9dec52048022e7f8febbff30b1674d52831d3 Mon Sep 17 00:00:00 2001 From: woody Date: Mon, 11 Aug 2025 17:48:01 +0800 Subject: [PATCH] =?UTF-8?q?feat(SaOrder):=20=E8=AE=A2=E5=8D=95=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E6=B7=BB=E5=8A=A0=E6=9E=B6=E6=9E=84=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sale/order/controller/manager/SaOrderController.java | 2 ++ .../src/main/java/com/hzs/sale/order/vo/WaresOrderVo.java | 6 ++++++ .../main/resources/mapper/sale/order/SaOrderItemsMapper.xml | 1 + 3 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 2688531a..bbb1ee90 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 @@ -235,6 +235,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/WaresOrderVo.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/vo/WaresOrderVo.java index e87e7612..98a17f0d 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/vo/WaresOrderVo.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/vo/WaresOrderVo.java @@ -345,4 +345,10 @@ public class WaresOrderVo implements Serializable { */ @Excel(name = "订单套数") private Integer boxNum; + + /** + * 商品类型 + */ + private Integer isMakerGift; + private String isMakerGiftVal; } diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderItemsMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderItemsMapper.xml index 5331213f..a35b1516 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderItemsMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderItemsMapper.xml @@ -756,6 +756,7 @@ bw.WARES_NAME commodityName, oi.WARES_QUANTITY waresQuantity, oi.SKU_CODE skuCode, + oi.IS_MAKER_GIFT isMakerGift, ver.VERTEX_NAME vertexName from sa_order_items oi left join sa_order so on oi.PK_ORDER = so.PK_ID