From 7326d0505f1eb114ae21fa2f0e0297b21f872140 Mon Sep 17 00:00:00 2001
From: Jack <46790855@qq.com>
Date: Tue, 2 Dec 2025 23:45:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=AE=B6=E9=A2=84=E8=AE=A1=E6=94=B6?=
 =?UTF-8?q?=E5=85=A5=E6=97=A0=E9=9C=80=E5=87=8F=20=E6=8B=89=E5=8D=A1?=
 =?UTF-8?q?=E6=8B=89=E5=B9=B3=E5=8F=B0=E8=B4=B9=EF=BC=8C=E9=85=8D=E9=80=81?=
 =?UTF-8?q?=E8=B4=B9=E8=AE=A1=E7=AE=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E5=B9=B3=E5=8F=B0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/modules/store/ShopStoreSameCityTransportBase.java  | 3 +++
 .../src/main/resources/mapper/order/ShopOrderBaseMapper.xml   | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/mall-common/src/main/java/com/suisung/mall/common/modules/store/ShopStoreSameCityTransportBase.java b/mall-common/src/main/java/com/suisung/mall/common/modules/store/ShopStoreSameCityTransportBase.java
index 00c097b6..8204ee6e 100644
--- a/mall-common/src/main/java/com/suisung/mall/common/modules/store/ShopStoreSameCityTransportBase.java
+++ b/mall-common/src/main/java/com/suisung/mall/common/modules/store/ShopStoreSameCityTransportBase.java
@@ -43,6 +43,9 @@ public class ShopStoreSameCityTransportBase implements Serializable {
     @TableId(value = "transport_base_id", type = IdType.AUTO)
     private Long transport_base_id;
 
+    @ApiModelProperty(value = "平台配送费设置？1-是；2-否")
+    private Integer is_platform;
+
     @ApiModelProperty(value = "店铺ID")
     private Long store_id;
 
diff --git a/mall-shop/src/main/resources/mapper/order/ShopOrderBaseMapper.xml b/mall-shop/src/main/resources/mapper/order/ShopOrderBaseMapper.xml
index b18acf8f..4e5a8bbf 100644
--- a/mall-shop/src/main/resources/mapper/order/ShopOrderBaseMapper.xml
+++ b/mall-shop/src/main/resources/mapper/order/ShopOrderBaseMapper.xml
@@ -819,8 +819,8 @@
             <!--总计优惠金额 order_discount_amount + order_voucher_price + order_points_fee + order_adjust_fee-->
             (od.order_discount_amount + od.voucher_price + od.order_points_fee + od.order_adjust_fee) as
             total_discount_amount,
-            <!--预计收入：订单原价金额-总计优惠金额-配送费-平台费-拉卡拉手续费 + 打包费-->
-            (ob.order_product_amount-od.order_discount_amount-od.voucher_price-od.order_points_fee-od.order_adjust_fee-od.platform_fee-order_shipping_fee_inner-lkl_fee+od.packing_fee)
+            <!--预计收入：订单原价金额-总计优惠金额-配送费-平台费+打包费-->
+            (ob.order_product_amount-od.order_discount_amount-od.voucher_price-od.order_points_fee-od.order_adjust_fee-od.platform_fee-order_shipping_fee_inner+od.packing_fee)
             as order_income_amount,
             (od.platform_fee+lkl_fee) as platform_fee,
             od.packing_fee,