From c06d972894b536cd96b817c922fb73f69c9d1a71 Mon Sep 17 00:00:00 2001
From: zepengdev <lzpsmith@outlook.com>
Date: Wed, 17 Sep 2025 19:28:40 +0800
Subject: [PATCH] fix: 调整店铺与商户绑定方式
---
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