From c518d87b397ff7f1705045f08263ce5f1eb42f50 Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Wed, 20 Mar 2024 16:38:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A5=E8=B4=B4=E9=87=91?=
 =?UTF-8?q?=E9=A2=9D=E7=9A=84=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/dao/store/coupon/StoreCouponUserDao.php | 4 ++--
 app/controller/api/server/Store.php                | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/common/dao/store/coupon/StoreCouponUserDao.php b/app/common/dao/store/coupon/StoreCouponUserDao.php
index 7f9b6475..2854d3f5 100644
--- a/app/common/dao/store/coupon/StoreCouponUserDao.php
+++ b/app/common/dao/store/coupon/StoreCouponUserDao.php
@@ -312,12 +312,12 @@ class StoreCouponUserDao extends BaseDao
             ->field('coupon_price,coupon_type')
             ->select()->toArray();
         $result = [
-            [
+            StoreCouponRepository::TYPE_STORE_COUPON => [
                 'total_amount' => 0.00,
                 'type' => StoreCouponRepository::TYPE_STORE_COUPON,
                 'type_cn' => StoreCouponRepository::TYPE_MAP[StoreCouponRepository::TYPE_STORE_COUPON],
             ],
-            [
+            StoreCouponRepository::TYPE_PLATFORM_CARD => [
                 'total_amount' => 0.00,
                 'type' => StoreCouponRepository::TYPE_PLATFORM_CARD,
                 'type_cn' => StoreCouponRepository::TYPE_MAP[StoreCouponRepository::TYPE_PLATFORM_CARD],
diff --git a/app/controller/api/server/Store.php b/app/controller/api/server/Store.php
index fb8e3ecd..7e92024d 100644
--- a/app/controller/api/server/Store.php
+++ b/app/controller/api/server/Store.php
@@ -203,7 +203,7 @@ class Store extends BaseController
             $couponPrice = 0;
             $saleTarget = 0;
             foreach ($coupon['config'] as $item) {
-                if (!in_array($merchantTypeId, $item['type_id'])) {
+                if (in_array($merchantTypeId, $item['type_id'])) {
                     $couponPrice = $item['subsidy'];
                     $saleTarget = $item['amount'];
                     break;