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 +}