pdkj
/
jiqu-library-server
6
0
Fork 0
Code Releases Activity

调整活动bug

release
vine_liutk 2022-03-22 11:22:03 +08:00
parent 4f4518a780
commit 2847c41f3c
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Admin/Controllers/ActivityController.php
View File

@ -28,7 +28,7 @@ class ActivityController extends AdminController
return Grid::make(new Activity(), function (Grid $grid) { return Grid::make(new Activity(), function (Grid $grid) {
$grid->column('id')->sortable(); $grid->column('id')->sortable();
$grid->column('title'); $grid->column('title');
$grid->column('cover')->image(100); $grid->column('cover')->image(50);
// $grid->column('content'); // $grid->column('content');
$grid->column('is_use')->filter(Grid\Column\Filter\In::make([ $grid->column('is_use')->filter(Grid\Column\Filter\In::make([
0=>'下架', 0=>'下架',

8
app/Services/OrderService.php
View File

@ -399,7 +399,13 @@ class OrderService
$activityArr[$item->activity_id][] = $item->part_id; $activityArr[$item->activity_id][] = $item->part_id;
}); });
$giveGifts = []; $giveGifts = [];
$sendedActivities = [];
foreach ($partActivities as $partActivity) { foreach ($partActivities as $partActivity) {
//判断该活动是否已处理
if (in_array($partActivity->activity_id, $sendedActivities)) {
continue;
}
$sendedActivities[] = $partActivity->activity_id;
//获取活动的赠品赠送规则 //获取活动的赠品赠送规则
$_giftsRule = $partActivity->activity?->gifts_rule; $_giftsRule = $partActivity->activity?->gifts_rule;
//判断是否首单：times=0为仅首单赠送, 1为不限 //判断是否首单：times=0为仅首单赠送, 1为不限
@ -423,7 +429,7 @@ class OrderService
$_gifts = $partActivity->activity->gifts; $_gifts = $partActivity->activity->gifts;
$_num = 0; $_num = 0;
foreach ($_gifts as $_gift) { foreach ($_gifts as $_gift) {
if ($_gift->stock - $_gift->pivot->qty >= 0) { if (($_gift->stock - $_gift->pivot->qty) >= 0) {
$_num += $_gift->pivot->qty; $_num += $_gift->pivot->qty;
$giveGifts[] = [ $giveGifts[] = [
'gift_for_sku_id'=> null, 'gift_for_sku_id'=> null,