cf_cloud/erp
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

!159 修改

Browse Source 
Merge pull request !159 from 赵世界/develop
This commit is contained in:
赵世界 2023-04-23 02:38:41 +00:00 committed by Gitee
commit 249708a8d5
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Events/BusinessOrdersUpdate.php
View File

@ -19,6 +19,7 @@ class BusinessOrdersUpdate
public $num; public $num;
public $businessGoods; public $businessGoods;
public $goodsSku; public $goodsSku;
public $combinationGoodsUpdate;
/** /**
* Create a new event instance. * Create a new event instance.
@ -27,6 +28,7 @@ class BusinessOrdersUpdate
*/ */
public function __construct($item, $num) public function __construct($item, $num)
{ {
$this->combinationGoodsUpdate = false;
$this->businessGoods = $item->toArray(); $this->businessGoods = $item->toArray();
$this->num = $num; $this->num = $num;
$this->updateStock(); $this->updateStock();

4
app/Http/Controllers/Business/BusinessGoodsSkusController.php
View File

@ -147,6 +147,7 @@ class BusinessGoodsSkusController extends Controller
->whereIn('name', $shopNames) ->whereIn('name', $shopNames)
->get(); ->get();
$data = []; $data = [];
$noActivityTitle = ['补款勿拍', '补运费'];
foreach ($shops as $shop) { foreach ($shops as $shop) {
$business = BusinessFactory::init()->make($shop->plat_id); $business = BusinessFactory::init()->make($shop->plat_id);
$business->setShop($shop); $business->setShop($shop);
@ -156,7 +157,8 @@ class BusinessGoodsSkusController extends Controller
} }
$activityNos = $activities = []; $activityNos = $activities = [];
foreach ($res['ktt_group_query_list_response']['activity_list'] as $activity) { 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']; $activityNos[] = $activity['activity_no'];
$activities[$activity['activity_no']] = $activity['title']; $activities[$activity['activity_no']] = $activity['title'];
} }