From 2c22405ebec7ac1ea4e216de9a015477a97012cd Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Wed, 7 Feb 2024 16:19:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BE=9B=E9=94=80=E4=BD=A3?=
 =?UTF-8?q?=E9=87=91=E9=80=80=E6=AC=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/dao/store/consumption/CommissionDao.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/common/dao/store/consumption/CommissionDao.php b/app/common/dao/store/consumption/CommissionDao.php
index f4e21982..59dbf70a 100755
--- a/app/common/dao/store/consumption/CommissionDao.php
+++ b/app/common/dao/store/consumption/CommissionDao.php
@@ -187,7 +187,7 @@ class CommissionDao
         }
 
         $promotionCode = User::where('uid', $refundOrder['uid'])->value('promotion_code');
-        if ($promotionCode) {
+        if ($promotionCode && strpos($promotionCode, 'mer_') === false){
             $curl = new Curl();
             $aes = new \AES();
             $timestamp = time();
@@ -197,9 +197,7 @@ class CommissionDao
             $url = env('task.new_worker_host_url') . '/api/shop_call/handleRefund';
             $result = $curl->post($url, ['timestamp' => $timestamp, 'data' => $encrypt]);
             $result = json_decode($result, true);
-            if ($result['code'] != 1) {
-                Log::error('发起佣金退款失败：' . var_export($result, true));
-            }
+            Log::error('发起佣金退款：' . var_export($result, true));
         }
     }
 
@@ -255,4 +253,4 @@ class CommissionDao
         return $users;
     }
 
-}
\ No newline at end of file
+}