From 59590ef2daefafabc4161b06afdbd739d4782e10 Mon Sep 17 00:00:00 2001
From: Jack <46790855@qq.com>
Date: Mon, 5 Jan 2026 21:21:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E5=BA=97=E9=93=BA=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E8=87=AA=E9=85=8D?=
 =?UTF-8?q?=E9=80=81=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shop/store/controller/admin/ShopStoreBaseController.java   | 1 +
 .../mall/shop/store/service/impl/ShopStoreBaseServiceImpl.java | 3 +++
 .../src/main/resources/mapper/order/ShopOrderBaseMapper.xml    | 3 ++-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/controller/admin/ShopStoreBaseController.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/controller/admin/ShopStoreBaseController.java
index 33b083b0..97d75e97 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/store/controller/admin/ShopStoreBaseController.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/controller/admin/ShopStoreBaseController.java
@@ -93,6 +93,7 @@ public class ShopStoreBaseController extends BaseControllerImpl {
         if (StrUtil.isNotBlank(store_area)) {
             queryWrapper.like("store_area", store_area);
         }
+
         Integer user_id = shopStoreBase.getUser_id();
         if (ObjectUtil.isNotNull(user_id)) {
             queryWrapper.eq("user_id", user_id);
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreBaseServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreBaseServiceImpl.java
index d2605702..56f485fb 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreBaseServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreBaseServiceImpl.java
@@ -285,6 +285,9 @@ public class ShopStoreBaseServiceImpl extends BaseServiceImpl<ShopStoreBaseMappe
                 Optional<ShopBaseStoreGrade> baseStoreGrades = base_store_grade_rows.stream().filter(h -> ObjectUtil.equal(h.getStore_grade_id(), store_grade_id)).findFirst();
                 ShopBaseStoreGrade grade = baseStoreGrades.orElseGet(ShopBaseStoreGrade::new);
                 s.put("store_grade_name", grade.getStore_grade_name());
+
+                // 店铺是否自配送？
+                s.put("is_delivery_self", s.getOrDefault("is_delivery_self", CommonConstant.Disable2));
             });
         }
 
diff --git a/mall-shop/src/main/resources/mapper/order/ShopOrderBaseMapper.xml b/mall-shop/src/main/resources/mapper/order/ShopOrderBaseMapper.xml
index 5a61b794..47a412eb 100644
--- a/mall-shop/src/main/resources/mapper/order/ShopOrderBaseMapper.xml
+++ b/mall-shop/src/main/resources/mapper/order/ShopOrderBaseMapper.xml
@@ -820,7 +820,8 @@
             (od.order_discount_amount + od.voucher_price + od.order_points_fee + od.order_adjust_fee) as
             total_discount_amount,
             <!--预计收入：订单原价金额-总计优惠金额-配送费-平台费-拉卡拉手续费+打包费   如果是负数即时给0-->
-            GREATEST(0, od.order_item_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) as order_income_amount,
+<!--            GREATEST(0, od.order_item_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) as order_income_amount,-->
+            GREATEST(0, od.trade_payment_money-od.platform_fee-od.lkl_fee) as order_income_amount,
             od.platform_fee,
             od.packing_fee,
             od.order_message,