From 273815b728bc8b5822b58fc4a8408f7b05e6ec3b Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Tue, 5 Mar 2024 17:37:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E5=8D=A1=E4=B8=8D=E8=AE=A1?=
 =?UTF-8?q?=E5=85=A5=E9=87=87=E8=B4=AD=E9=87=91=E9=A2=9D=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=A2=9E=E6=94=B6=E8=A1=A5=E8=B4=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/repositories/store/order/StoreOrderRepository.php | 2 +-
 app/controller/api/server/Store.php                          | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/common/repositories/store/order/StoreOrderRepository.php b/app/common/repositories/store/order/StoreOrderRepository.php
index e7242390..a656815d 100755
--- a/app/common/repositories/store/order/StoreOrderRepository.php
+++ b/app/common/repositories/store/order/StoreOrderRepository.php
@@ -792,7 +792,7 @@ class StoreOrderRepository extends BaseRepository
             }
             $order->save();
 
-            if ($order->uid != $order->merchant->uid) {
+            if ($order->uid != $order->merchant->uid && !$order->orderProduct[0]->product->isPlatformCard()) {
                 $refundPrice = StoreRefundOrder::where('order_id', $order['order_id'])->where('status', '<>', -1)->sum('refund_price');
                 $money = bcsub($order->total_price, bcadd($order['extension_one'], $order['extension_two'], 3), 2);
                 $money = bcsub($money, $refundPrice, 2);
diff --git a/app/controller/api/server/Store.php b/app/controller/api/server/Store.php
index 019fb13f..aae4ea4e 100644
--- a/app/controller/api/server/Store.php
+++ b/app/controller/api/server/Store.php
@@ -97,6 +97,7 @@ class Store extends BaseController
                 $saleTarget = $userConsumption['coupon_price'];
                 $purchaseTarget = $userConsumption['coupon_price'];
                 $merchant['purchase_amount'] = bcsub($userConsumption['coupon_price'], $userConsumption['balance'], 2);
+                $merchant['balance'] = $userConsumption['balance'];
             }
         } else {
             //增收销售补贴
@@ -108,6 +109,7 @@ class Store extends BaseController
                     ->field('coupon_price,balance,status')
                     ->find();
                 $subsidyAmount = $userConsumption['coupon_price'] ?? '0.00';
+                $merchant['balance'] = $userConsumption['balance'] ?? '0.00';
                 foreach ($consumption['config'] as $k => $item) {
                     if (empty($userConsumption) && in_array($merchant['type_id'], $item['type_id'])) {
                         $saleTarget = $item['amount'];
@@ -143,6 +145,7 @@ class Store extends BaseController
             'spring_subsidy' => $saleTarget,
             'spring_subsidy_amount' => $merchant['purchase_amount'],
             'spring_subsidy_rate' => $springSubsidyRate,
+            'balance' => $merchant['balance'],
         ]);
     }