From 011cbec842018927a4b517d59657aca694842a46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E4=B8=96=E7=95=8C?= <642747453@qq.com> Date: Sun, 29 Jan 2023 11:29:48 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20#10000=20=E4=BC=98=E5=8C=96=E5=BF=AB?= =?UTF-8?q?=E5=9B=A2=E5=9B=A2=E5=BA=97=E9=93=BA=E5=95=86=E5=93=81=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Shop/ShopsController.php | 7 ++++- app/Models/BusinessGoodsSku.php | 5 ---- app/Models/BusinessOrder.php | 5 ---- app/Models/BusinessOrderItem.php | 5 ---- app/Models/GoodsSku.php | 5 ---- app/Services/Business/BusinessClient.php | 2 +- app/Services/Business/KuaiTuanTuan/Goods.php | 2 +- .../Business/KuaiTuanTuan/KuaiTuanTuan.php | 26 +++++++++---------- app/Services/Business/MiaoXuan/MiaoXuan.php | 2 +- 9 files changed, 22 insertions(+), 37 deletions(-) diff --git a/app/Http/Controllers/Shop/ShopsController.php b/app/Http/Controllers/Shop/ShopsController.php index d8b0e85..7cfdc36 100644 --- a/app/Http/Controllers/Shop/ShopsController.php +++ b/app/Http/Controllers/Shop/ShopsController.php @@ -174,7 +174,12 @@ class ShopsController extends Controller $shop = Shop::query()->find($id); $business = BusinessFactory::init()->make($shop->plat_id); $business->setShop($shop); - $business->downloadGoodsListAndBind(); + $res = $business->queryGroup(); + if (isset($res['ktt_group_query_list_response'])) { + foreach ($res['ktt_group_query_list_response']['activity_list'] as $activity) { + $business->downloadGoodsListAndBind($activity['activity_no']); + } + } return response($this->res, $this->res['httpCode']); } diff --git a/app/Models/BusinessGoodsSku.php b/app/Models/BusinessGoodsSku.php index 1fdc5da..d9dc1fa 100644 --- a/app/Models/BusinessGoodsSku.php +++ b/app/Models/BusinessGoodsSku.php @@ -41,11 +41,6 @@ class BusinessGoodsSku extends Model 'create_time' ]; - /** - * 不可批量赋值的属性。为空则所有熟悉都可以批量赋值 - * - * @var array - */ protected $fillable = [ 'shop_id', 'business_order_id', diff --git a/app/Models/BusinessOrder.php b/app/Models/BusinessOrder.php index 913a45a..be5a2bd 100644 --- a/app/Models/BusinessOrder.php +++ b/app/Models/BusinessOrder.php @@ -4,11 +4,6 @@ namespace App\Models; class BusinessOrder extends Model { - /** - * 不可批量赋值的属性。为空则所有熟悉都可以批量赋值 - * - * @var array - */ protected $fillable = [ 'shop_id', 'receiver_address_detail', diff --git a/app/Models/BusinessOrderItem.php b/app/Models/BusinessOrderItem.php index a656040..3772649 100644 --- a/app/Models/BusinessOrderItem.php +++ b/app/Models/BusinessOrderItem.php @@ -4,11 +4,6 @@ namespace App\Models; class BusinessOrderItem extends Model { - /** - * 不可批量赋值的属性。为空则所有熟悉都可以批量赋值 - * - * @var array - */ protected $fillable = [ 'shop_id', 'business_order_id', diff --git a/app/Models/GoodsSku.php b/app/Models/GoodsSku.php index a10a45e..554ccfb 100644 --- a/app/Models/GoodsSku.php +++ b/app/Models/GoodsSku.php @@ -15,11 +15,6 @@ class GoodsSku extends Model 'exclude_ids' ]; - /** - * 不可批量赋值的属性。为空则所有熟悉都可以批量赋值 - * - * @var array - */ protected $fillable = [ 'goods_id', 'title', diff --git a/app/Services/Business/BusinessClient.php b/app/Services/Business/BusinessClient.php index a25f182..238eef7 100644 --- a/app/Services/Business/BusinessClient.php +++ b/app/Services/Business/BusinessClient.php @@ -23,7 +23,7 @@ abstract class BusinessClient abstract public function auth(); - abstract public function downloadGoodsListAndBind(); + abstract public function downloadGoodsListAndBind($activityNo); abstract public function downloadGoods($skuId); diff --git a/app/Services/Business/KuaiTuanTuan/Goods.php b/app/Services/Business/KuaiTuanTuan/Goods.php index 7c73f5e..4e6d225 100644 --- a/app/Services/Business/KuaiTuanTuan/Goods.php +++ b/app/Services/Business/KuaiTuanTuan/Goods.php @@ -11,7 +11,7 @@ class Goods { $type = 'pdd.ktt.goods.query.list'; $appendParams = [ -// 'activity_no' => $activityNo, // 非必填,团号（团号和创建时间只能传一个） + 'activity_no' => $activityNo, // 非必填,团号（团号和创建时间只能传一个） 'page' => $page, 'size' => $size, // 'update_time_end' => '', // 非必填,结束最后更新时间（毫秒级时间戳） diff --git a/app/Services/Business/KuaiTuanTuan/KuaiTuanTuan.php b/app/Services/Business/KuaiTuanTuan/KuaiTuanTuan.php index 2d05bf6..5d62b47 100644 --- a/app/Services/Business/KuaiTuanTuan/KuaiTuanTuan.php +++ b/app/Services/Business/KuaiTuanTuan/KuaiTuanTuan.php @@ -40,15 +40,15 @@ class KuaiTuanTuan extends BusinessClient return $this->shop; } - public function downloadGoodsListAndBind($page = 1) + public function downloadGoodsListAndBind($activityNo, $page = 1) { - [$type, $appendParams] = Goods::downloadGoods($this->shop->owner_id, $page); + [$type, $appendParams] = Goods::downloadGoods($activityNo, $page); $res = $this->doRequest($type, $appendParams); $goods = $res['ktt_goods_query_list_response']['goods_list']; $this->bindGoods($goods); $pageNum = ceil($res['ktt_goods_query_list_response']['total'] / $appendParams['size']); if ($pageNum > $page && 60 >= $page) { - $this->downloadGoodsListAndBind($page + 1); + $this->downloadGoodsListAndBind($activityNo, $page + 1); } } @@ -221,16 +221,16 @@ class KuaiTuanTuan extends BusinessClient { [$type, $appendParams] = Groups::queryGroup(); $res = $this->doRequest($type, $appendParams); - if (isset($res['ktt_group_query_list_response'])) { - foreach ($res['ktt_group_query_list_response']['activity_list'] as $activity) { - $group = GroupsModel::query()->where('activity_no', $activity['activity_no'])->first(); - if ($group) { - $group->is_help_sell = $activity['']; - $group->status = $activity['']; - $group->save(); - } - } - } +// if (isset($res['ktt_group_query_list_response'])) { +// foreach ($res['ktt_group_query_list_response']['activity_list'] as $activity) { +// $group = GroupsModel::query()->where('activity_no', $activity['activity_no'])->first(); +// if ($group) { +// $group->is_help_sell = $activity['']; +// $group->status = $activity['']; +// $group->save(); +// } +// } +// } return $res; } diff --git a/app/Services/Business/MiaoXuan/MiaoXuan.php b/app/Services/Business/MiaoXuan/MiaoXuan.php index b80d041..8e18ae9 100644 --- a/app/Services/Business/MiaoXuan/MiaoXuan.php +++ b/app/Services/Business/MiaoXuan/MiaoXuan.php @@ -13,7 +13,7 @@ class MiaoXuan extends BusinessClient // TODO: Implement auth() method. } - public function downloadGoodsListAndBind() + public function downloadGoodsListAndBind($activityNo) { }