From 8c182b3ba68aa74befe624697cb842e1b53034eb Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Thu, 07 Aug 2025 16:47:01 +0800
Subject: [PATCH] 订单-打包费

---
 oying-system/src/main/java/com/oying/modules/sh/domain/vo/OrderInfo.java |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/oying-system/src/main/java/com/oying/modules/sh/domain/vo/OrderInfo.java b/oying-system/src/main/java/com/oying/modules/sh/domain/vo/OrderInfo.java
index 2d57589..a6270c2 100644
--- a/oying-system/src/main/java/com/oying/modules/sh/domain/vo/OrderInfo.java
+++ b/oying-system/src/main/java/com/oying/modules/sh/domain/vo/OrderInfo.java
@@ -1,5 +1,6 @@
 package com.oying.modules.sh.domain.vo;
 
+import com.oying.modules.pc.store.domain.Store;
 import com.oying.modules.sh.domain.UserAddress;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -17,6 +18,8 @@
 @Setter
 public class OrderInfo {
 
+    @ApiModelProperty(value = "门店信息")
+    private Store store;
     @ApiModelProperty(value = "商品信息列")
     private List<ProductInfo> products;
     @ApiModelProperty(value = "用户地址信息")
@@ -29,8 +32,8 @@
     private BigDecimal promotionAmount = BigDecimal.ZERO;
     @ApiModelProperty(value = "优惠卷待定")
     private Object coupon;
-    @ApiModelProperty(value = "运费待定")
-    private Object shippingFee;
-    @ApiModelProperty(value = "打包费待定")
-    private Object packingCharges;
+    @ApiModelProperty(value = "配送费")
+    private BigDecimal deliveryPrice = BigDecimal.ZERO;
+    @ApiModelProperty(value = "打包费")
+    private BigDecimal packagingPrice = BigDecimal.ZERO;
 }

--
Gitblit v1.9.3