调整补贴发放

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;

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)) {