From 38abb920329c3369657641e680c40fb53e34ed7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E4=B8=96=E7=95=8C?= <642747453@qq.com> Date: Fri, 16 Sep 2022 10:30:51 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20#20220916=20=E5=90=8C=E6=AD=A5=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Business/BusinessGoodsSkusController.php | 6 +++--- app/Services/Business/KuaiTuanTuan/Goods.php | 2 ++ .../Business/KuaiTuanTuan/KuaiTuanTuan.php | 14 -------------- 3 files changed, 5 insertions(+), 17 deletions(-) diff --git a/app/Http/Controllers/Business/BusinessGoodsSkusController.php b/app/Http/Controllers/Business/BusinessGoodsSkusController.php index 021ee0d..fd76e9f 100644 --- a/app/Http/Controllers/Business/BusinessGoodsSkusController.php +++ b/app/Http/Controllers/Business/BusinessGoodsSkusController.php @@ -35,7 +35,7 @@ class BusinessGoodsSkusController extends Controller return BusinessGoodsSkuResource::collection($businessGoodsSkus); } - public function update(Request $request, $id) + public function update($id, Request $request) { $validator = Validator::make($request->all(), [ 'is_sync' => ['required', Rule::in([0, 1])] @@ -55,7 +55,7 @@ class BusinessGoodsSkusController extends Controller return response($this->res, $this->res['httpCode']); } - public function destroy(Request $request, $id) + public function destroy($id, Request $request) { DB::beginTransaction(); try { @@ -75,7 +75,7 @@ class BusinessGoodsSkusController extends Controller return response($this->res, $this->res['httpCode']); } - public function syncStock(Request $request, $id) + public function syncStock($id, Request $request) { $businessGoodsSku = BusinessGoodsSku::find($id); [$goodsCode, $skuCode] = explode('_', $businessGoodsSku->external_sku_id); diff --git a/app/Services/Business/KuaiTuanTuan/Goods.php b/app/Services/Business/KuaiTuanTuan/Goods.php index 473bd42..4a9b981 100644 --- a/app/Services/Business/KuaiTuanTuan/Goods.php +++ b/app/Services/Business/KuaiTuanTuan/Goods.php @@ -41,6 +41,8 @@ class Goods if (!empty($businessGoodSku->external_sku_id)) { event(new BusinessOrdersUpdate($businessGoodSku, 0)); } + } else { + $businessGoodSku->update($data); } } } diff --git a/app/Services/Business/KuaiTuanTuan/KuaiTuanTuan.php b/app/Services/Business/KuaiTuanTuan/KuaiTuanTuan.php index 1260997..6ec762c 100644 --- a/app/Services/Business/KuaiTuanTuan/KuaiTuanTuan.php +++ b/app/Services/Business/KuaiTuanTuan/KuaiTuanTuan.php @@ -5,8 +5,6 @@ namespace App\Services\Business\KuaiTuanTuan; use App\Models\BusinessGoodsSku; use App\Models\GoodsSku; use App\Services\Business\BusinessClient; -use App\Models\Log; -use App\Utils\DateTimeUtils; class KuaiTuanTuan extends BusinessClient { @@ -42,18 +40,6 @@ class KuaiTuanTuan extends BusinessClient public function downloadGoodsListAndBind($page = 1) { [$type, $appendParams] = Goods::downloadGoods($this->shop->owner_id, $page); - $log = Log::query() - ->where('target_field', 'pdd.ktt.goods.query.list') - ->where('target_id', $this->shop->id) - ->orderBy('id', 'desc') - ->first(); - if ($log) { - $lastGetTime = DateTimeUtils::getMicroTime($log->created_at); - // 毫秒时间戳,往前算3分钟 - $startTime = $lastGetTime - 30000; - $appendParams['update_time_start'] = $startTime; - $appendParams['update_time_end'] = DateTimeUtils::getMicroTime(); - } $res = $this->doRequest($type, $appendParams); $goods = $res['ktt_goods_query_list_response']['goods_list']; $this->bindGoods($goods);