diff --git a/app/Events/BusinessOrdersUpdate.php b/app/Events/BusinessOrdersUpdate.php index 38f7bff..c1748e2 100644 --- a/app/Events/BusinessOrdersUpdate.php +++ b/app/Events/BusinessOrdersUpdate.php @@ -19,6 +19,7 @@ class BusinessOrdersUpdate public $num; public $businessGoods; public $goodsSku; + public $combinationGoodsUpdate; /** * Create a new event instance. @@ -27,6 +28,7 @@ class BusinessOrdersUpdate */ public function __construct($item, $num) { + $this->combinationGoodsUpdate = false; $this->businessGoods = $item->toArray(); $this->num = $num; $this->updateStock(); diff --git a/app/Http/Controllers/Business/BusinessGoodsSkusController.php b/app/Http/Controllers/Business/BusinessGoodsSkusController.php index 9a13f0e..7a95cba 100644 --- a/app/Http/Controllers/Business/BusinessGoodsSkusController.php +++ b/app/Http/Controllers/Business/BusinessGoodsSkusController.php @@ -147,6 +147,7 @@ class BusinessGoodsSkusController extends Controller ->whereIn('name', $shopNames) ->get(); $data = []; + $noActivityTitle = ['补款勿拍', '补运费']; foreach ($shops as $shop) { $business = BusinessFactory::init()->make($shop->plat_id); $business->setShop($shop); @@ -156,7 +157,8 @@ class BusinessGoodsSkusController extends Controller } $activityNos = $activities = []; foreach ($res['ktt_group_query_list_response']['activity_list'] as $activity) { - if (0 === $activity['is_help_sell'] && '补款勿拍' !== $activity['title']) { + $title = str_replace(' ', $activity['title']); + if (0 === $activity['is_help_sell'] && !in_array($title, $noActivityTitle, true)) { $activityNos[] = $activity['activity_no']; $activities[$activity['activity_no']] = $activity['title']; }