From d5fdcd2262474e0a2261b10d2fd759b5d5594b2b Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Tue, 12 Mar 2024 14:06:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AE=A2=E5=8D=95=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=E6=9F=A5=E8=AF=A2=EF=BC=8C=E5=A4=84=E7=90=86=E5=95=86?=
 =?UTF-8?q?=E6=88=B7=E9=94=80=E5=94=AE=E9=87=91=E9=A2=9D=E7=9A=84=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repositories/store/order/StoreOrderRepository.php     | 2 +-
 .../store/order/StoreRefundOrderRepository.php            | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/app/common/repositories/store/order/StoreOrderRepository.php b/app/common/repositories/store/order/StoreOrderRepository.php
index 86e64e45..e234f95c 100755
--- a/app/common/repositories/store/order/StoreOrderRepository.php
+++ b/app/common/repositories/store/order/StoreOrderRepository.php
@@ -648,7 +648,7 @@ class StoreOrderRepository extends BaseRepository
         $noDeliver  = $this->dao->search(['uid' => $uid, 'is_user' => $isUser])->where($this->getOrderType(3))->where($where)->where('StoreOrder.is_del', 0)->fetchSql(false)->count();
         $noComment  = $this->dao->search(['uid' => $uid, 'is_user' => $isUser])->where($this->getOrderType(4))->where($where)->where('StoreOrder.is_del', 0)->fetchSql(false)->count();
         $done       = $this->dao->search(['uid' => $uid, 'is_user' => $isUser])->where($this->getOrderType(5))->where($where)->where('StoreOrder.is_del', 0)->fetchSql(false)->count();
-        $refund     = StoreRefundOrder::alias('t1')->join('store_order t2', 't1.order_id=t2.order_id')->where('t1.uid', $uid)->where('t1.status', 3)->where('t2.activity_type', $product_type)->count();
+        $refund     = StoreRefundOrder::alias('t1')->join('store_order t2', 't1.order_id=t2.order_id')->where('t1.uid', $uid)->whereIn('t1.status', [0, 1, 2])->where('t2.activity_type', $product_type)->count();
         $orderPrice = $this->dao->search(['uid' => $uid, 'is_user' => $isUser])->where($this->getOrderType(8))->where($where)->where('StoreOrder.is_del', 0)->fetchSql(false)->sum('pay_price');
         $orderCount = $this->dao->search(['uid' => $uid, 'is_user' => $isUser])->where($where)->where('StoreOrder.is_del', 0)->fetchSql(false)->count();
         return compact('noComment', 'done', 'refund', 'noDeliver', 'noPay', 'noPostage', 'orderPrice', 'orderCount');
diff --git a/app/common/repositories/store/order/StoreRefundOrderRepository.php b/app/common/repositories/store/order/StoreRefundOrderRepository.php
index 1bfc8ab6..afa4e54a 100755
--- a/app/common/repositories/store/order/StoreRefundOrderRepository.php
+++ b/app/common/repositories/store/order/StoreRefundOrderRepository.php
@@ -1186,14 +1186,6 @@ class StoreRefundOrderRepository extends BaseRepository
         //退供应链订单
         (new StoreOrderOtherDao())->refund($refundOrder);
 
-        //订单退款，减少当前商户销售金额和下单商户采购金额
-        $money = bcadd($refundOrder['refund_price'], $refundOrder['refund_consumption'], 2);
-        Merchant::where('mer_id', $refundOrder['mer_id'])->update(['sale_amount' => Db::raw('sale_amount-' . $money)]);
-        $merId = Merchant::where('uid', $refundOrder['uid'])->value('mer_id');
-        if (!empty($merId)) {
-            Merchant::where('mer_id', $merId)->update(['purchase_amount' => Db::raw('purchase_amount-' . $money)]);
-        }
-
         $productIds = CloudProduct::where('activity_id', 2)->column('product_id');
         StoreActivityOrderProduct::where('user_id', $refundOrder->order['uid'])
             ->whereIn('product_id', $productIds)