From 62d7afee3cca5608ad62a46a8755b31acb9b2082 Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Tue, 30 Jan 2024 17:49:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=95=86=E5=93=81=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=20=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/StoreRefundOrderRepository.php            | 8 ++++++++
 .../repositories/store/product/ProductRepository.php      | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/common/repositories/store/order/StoreRefundOrderRepository.php b/app/common/repositories/store/order/StoreRefundOrderRepository.php
index 042792bf..644f952e 100755
--- a/app/common/repositories/store/order/StoreRefundOrderRepository.php
+++ b/app/common/repositories/store/order/StoreRefundOrderRepository.php
@@ -21,6 +21,8 @@ use app\common\dao\store\StoreActivityOrderDao;
 use app\common\model\store\order\StoreGroupOrder;
 use app\common\model\store\order\StoreOrder;
 use app\common\model\store\order\StoreRefundOrder;
+use app\common\model\store\product\CloudProduct;
+use app\common\model\store\StoreActivityOrderProduct;
 use app\common\model\system\merchant\FinancialRecord;
 use app\common\repositories\BaseRepository;
 use app\common\repositories\store\product\ProductRepository;
@@ -1186,6 +1188,12 @@ class StoreRefundOrderRepository extends BaseRepository
 
         (new CommissionDao())->refundByOrder($refundOrder);
 
+        $productIds = CloudProduct::where('activity_id', 2)->column('product_id');
+        StoreActivityOrderProduct::where('user_id', $refundOrder->order['uid'])
+            ->whereIn('product_id', $productIds)
+            ->whereIn('activity_id', 2)
+            ->update(['status' => 0]);
+
         app()->make(FinancialRecordRepository::class)->dec([
             'order_id' => $refundOrder->refund_order_id,
             'order_sn' => $refundOrder->refund_order_sn,
diff --git a/app/common/repositories/store/product/ProductRepository.php b/app/common/repositories/store/product/ProductRepository.php
index 98f404fc..42100f88 100755
--- a/app/common/repositories/store/product/ProductRepository.php
+++ b/app/common/repositories/store/product/ProductRepository.php
@@ -1761,7 +1761,7 @@ class ProductRepository extends BaseRepository
             ]
         ], $product['mer_id']);
         app()->make(SpuRepository::class)->changeStatus($id, $product->product_type);
-        event('product.sell', ['product_id' => [$id,'status'=>$status]]);
+        event('product.sell', ['product_id' => [$id], 'status'=>$status]);
         $this->switchShow($id, $status, 'is_used', 0);
     }