From 5e31108d99d4e388f2b66b43b0253d47b27c6eec Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Sat, 2 Mar 2024 15:32:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E6=88=B7=E9=94=80?=
 =?UTF-8?q?=E5=94=AE=E9=87=91=E9=A2=9D=E5=92=8C=E9=87=87=E8=B4=AD=E9=87=91?=
 =?UTF-8?q?=E9=A2=9D=E7=9A=84=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../store/order/StoreOrderRepository.php            | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/app/common/repositories/store/order/StoreOrderRepository.php b/app/common/repositories/store/order/StoreOrderRepository.php
index c4a2f650..c20a6e59 100755
--- a/app/common/repositories/store/order/StoreOrderRepository.php
+++ b/app/common/repositories/store/order/StoreOrderRepository.php
@@ -344,16 +344,6 @@ class StoreOrderRepository extends BaseRepository
                 // 商户收入金额
                 $financeDao->platformOut($_payPrice, 'merchant_order', $order['mer_id']);
 
-                if ($isPickupCard) {
-                    //订单确认收货，增加商户销售金额
-                    Merchant::where('mer_id', $order->mer_id)->update(['sale_amount' => Db::raw('sale_amount+' . $_payPrice)]);
-                    //订单确认收货，增加商户采购金额
-                    $merId = Merchant::where('uid', $order->uid)->value('mer_id');
-                    if (!empty($merId)) {
-                        Merchant::where('mer_id', $merId)->update(['purchase_amount' => Db::raw('purchase_amount+' . $_payPrice)]);
-                    }
-                }
-
                 if ($is_combine) {
                     $profitsharing[] = [
                         'profitsharing_sn' => $storeOrderProfitsharingRepository->getOrderSn(),
@@ -804,7 +794,8 @@ class StoreOrderRepository extends BaseRepository
 
             if ($order->uid != $order->merchant->uid) {
                 $refundPrice = StoreRefundOrder::where('order_id', $order['order_id'])->where('status', '<>', -1)->sum('refund_price');
-                $money = bcsub($order->pay_price, $refundPrice, 2);
+                $money = bcsub($order->total_price, $order->consumption_money, 2);
+                $money = bcsub($money, $refundPrice, 2);
                 //订单确认收货，增加商户销售金额
                 Merchant::where('mer_id', $order->mer_id)->update(['sale_amount' => Db::raw('sale_amount+' . $money)]);
                 //订单确认收货，增加商户采购金额