From 738880dff19908eb8c63f3430b292c397f057399 Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Fri, 22 Mar 2024 17:44:08 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=A1=A5=E8=B4=B4=E5=8F=91?=
 =?UTF-8?q?=E6=94=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repositories/store/coupon/StoreCouponUserRepository.php      | 1 +
 .../repositories/store/order/StoreOrderCreateRepository.php      | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/common/repositories/store/coupon/StoreCouponUserRepository.php b/app/common/repositories/store/coupon/StoreCouponUserRepository.php
index da7011c2..86fd65e7 100644
--- a/app/common/repositories/store/coupon/StoreCouponUserRepository.php
+++ b/app/common/repositories/store/coupon/StoreCouponUserRepository.php
@@ -194,6 +194,7 @@ class StoreCouponUserRepository extends BaseRepository
                 $model = new StoreCouponUser();
                 $model->coupon_id = $this->coupon['coupon_id'];
                 $model->uid = $this->uid;
+                $model->mer_id = $this->coupon['mer_id'];
                 $model->coupon_title = $title;
                 $model->order_id_set = $this->orderIds;
                 $model->coupon_price = $this->coupon->coupon_price;
diff --git a/app/common/repositories/store/order/StoreOrderCreateRepository.php b/app/common/repositories/store/order/StoreOrderCreateRepository.php
index 5e9cfb73..fe9ac306 100644
--- a/app/common/repositories/store/order/StoreOrderCreateRepository.php
+++ b/app/common/repositories/store/order/StoreOrderCreateRepository.php
@@ -564,6 +564,7 @@ class StoreOrderCreateRepository extends StoreOrderRepository
         //计算平台券优惠金额
 //        if ($total_true_price > 0) {
         $cartCoupon = array_values($cartCoupon);
+        /** @var StoreCouponUserRepository $StoreCouponUser */
         $StoreCouponUser = app()->make(StoreCouponUserRepository::class);
         $platformCoupon = $StoreCouponUser->validUserPlatformCoupon($uid);
         if ($enabledPlatformCoupon && count($platformCoupon)) {