From cdf41ac58cd41c0f79ed92d00e1d7b0bd2ca2d86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E4=B8=96=E7=95=8C?= <642747453@qq.com> Date: Tue, 25 Oct 2022 11:24:43 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20#10000=20=E5=89=8D=E7=AB=AF=E6=89=93?= =?UTF-8?q?=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Group/GroupsController.php | 15 ++++++------ app/Listeners/GroupQueryListener.php | 4 ++-- app/Services/Business/KuaiTuanTuan/Groups.php | 4 ++-- .../Business/KuaiTuanTuan/KuaiTuanTuan.php | 2 ++ .../frontend/src/views/group/addGroup.vue | 21 +++++++++++------ .../frontend/src/views/group/editGroup.vue | 23 ++++++++++++------- 6 files changed, 42 insertions(+), 27 deletions(-) diff --git a/app/Http/Controllers/Group/GroupsController.php b/app/Http/Controllers/Group/GroupsController.php index ca9bf84..00354b6 100644 --- a/app/Http/Controllers/Group/GroupsController.php +++ b/app/Http/Controllers/Group/GroupsController.php @@ -72,8 +72,8 @@ class GroupsController extends Controller 'shop_id' => $shopId, 'title' => $group->title, 'is_save_preview' => $group->is_save_preview, - 'start_time' => $group->start_time, - 'end_time' => $group->end_time, + 'start_time' => strtotime($request->datetimerange[0]) * 1000, + 'end_time' => strtotime($request->datetimerange[1]) * 1000, ]; } (new Groups())->batchInsert($shopGroups); @@ -89,7 +89,7 @@ class GroupsController extends Controller 'limit_buy' => isset($changeData[$sku['id']]) ? $changeData[$sku['id']]['limit_buy'] : 0, 'sku_id' => $sku['id'], 'price_in_fen' => isset($changeData[$sku['id']]) ? $changeData[$sku['id']]['price_in_fen'] * 100 : $price, - 'sort' => isset($changeData[$sku['id']]) ? $changeData[$sku['id']]['sort'] : 500, + 'sort' => 500, 'external_sku_id' => $sku['goods']['goods_code'] . '_' . $sku['sku_code'], ]; } @@ -147,8 +147,8 @@ class GroupsController extends Controller ->where('parent_id', $group->id) ->update([ 'title' => $group->title, - 'start_time' => $group->start_time, - 'end_time' => $group->end_time, + 'start_time' => strtotime($request->datetimerange[0]) * 1000, + 'end_time' => strtotime($request->datetimerange[1]) * 1000, ]); GroupGoods::where('group_id', $id)->whereIn('sku_id', $deleteIds)->delete(); foreach ($skus as $sku) { @@ -160,7 +160,7 @@ class GroupsController extends Controller 'goods_id' => $sku['goods_id'], 'limit_buy' => isset($changeData[$sku['id']]) ? $changeData[$sku['id']]['limit_buy'] : 0, 'price_in_fen' => isset($changeData[$sku['id']]) ? $changeData[$sku['id']]['price_in_fen'] * 100 : $price, - 'sort' => isset($changeData[$sku['id']]) ? $changeData[$sku['id']]['sort'] : 500, + 'sort' => 500, 'external_sku_id' => $sku['goods']['goods_code'] . '_' . $sku['sku_code'], ]; GroupGoods::updateOrCreate( @@ -191,7 +191,7 @@ class GroupsController extends Controller $deleteIds = $request->get('delete_ids') ?: []; $groupId = $request->get('group_id'); $groupGoods = GroupGoods::query() - ->select(['id', 'sku_id', 'sort', 'limit_buy', 'price_in_fen']) + ->select(['id', 'sku_id', 'limit_buy', 'price_in_fen']) ->where('group_id', $groupId) ->whereNotIn('sku_id', $deleteIds) ->get() @@ -249,7 +249,6 @@ class GroupsController extends Controller foreach ($goodsSkus as &$goodsSku) { if (isset($groupGoods[$goodsSku['id']])) { $goodsSku['price_in_fen'] = $groupGoods[$goodsSku['id']]['price_in_fen']; - $goodsSku['sort'] = $groupGoods[$goodsSku['id']]['sort']; $goodsSku['limit_buy'] = $groupGoods[$goodsSku['id']]['limit_buy']; } else { $goodsSku['price_in_fen'] = $goodsSku['cost']; diff --git a/app/Listeners/GroupQueryListener.php b/app/Listeners/GroupQueryListener.php index 2b88629..5258023 100644 --- a/app/Listeners/GroupQueryListener.php +++ b/app/Listeners/GroupQueryListener.php @@ -34,10 +34,10 @@ class GroupQueryListener implements ShouldQueue $shops = Shop::query() ->where('plat_id', Shop::$PLAT_KTT) ->where('expires_at', '>', time()) - ->get() + ->get(['id', 'plat_id']) ->toArray(); foreach ($shops as $shop) { - $client = BusinessFactory::init()->make($shop['plat_id'])->setShop($shop); + $client = BusinessFactory::init()->make($shop['plat_id'])->setShopWithId($shop['id']); $client->createGroup($event->groupId); KttQueryGroupStatus::dispatch($event->groupId, $shop['id'])->delay(5); } diff --git a/app/Services/Business/KuaiTuanTuan/Groups.php b/app/Services/Business/KuaiTuanTuan/Groups.php index bf172a8..963081d 100644 --- a/app/Services/Business/KuaiTuanTuan/Groups.php +++ b/app/Services/Business/KuaiTuanTuan/Groups.php @@ -13,7 +13,7 @@ class Groups $type = 'pdd.ktt.group.create'; $group = GroupsModel::query()->where('parent_id', $localGroupId)->where('shop_id', $shop->id)->first(); $groupGoods = GroupGoods::query() - ->where('group_id', $group->id) + ->where('group_id', $group->parent_id) ->with(['goodsSku:id,stock']) ->orderBy('sort') ->get(); @@ -39,7 +39,7 @@ class Groups $priceInFen *= 100; $goodsSkus[] = [ 'category_name' => $item['category_name'], - 'goods_desc' => ' ', + 'goods_desc' => $item['goods_name'], 'goods_name' => $item['goods_name'], 'limit_buy' => $item['limit_buy'], 'market_price' => $priceInFen, diff --git a/app/Services/Business/KuaiTuanTuan/KuaiTuanTuan.php b/app/Services/Business/KuaiTuanTuan/KuaiTuanTuan.php index 7afd6bf..76b3b49 100644 --- a/app/Services/Business/KuaiTuanTuan/KuaiTuanTuan.php +++ b/app/Services/Business/KuaiTuanTuan/KuaiTuanTuan.php @@ -121,6 +121,8 @@ class KuaiTuanTuan extends BusinessClient } $publicParams = array_merge($publicParams, $appendParams); $publicParams['sign'] = $this->getSign($publicParams); + var_dump($publicParams); + exit(); $res = $this->formDataPostRequest($url, $publicParams); if (isset($res['error_response'])) { // ToDo 重构异常处理 diff --git a/resources/frontend/src/views/group/addGroup.vue b/resources/frontend/src/views/group/addGroup.vue index 1584df1..8f4f36a 100644 --- a/resources/frontend/src/views/group/addGroup.vue +++ b/resources/frontend/src/views/group/addGroup.vue @@ -24,7 +24,7 @@ 全部 - {{ goodsType.name }} + {{ goodsType.name }} 全部 - {{ goodsType.name }} + {{ goodsType.name }} 全部 - {{ goodsBrand.name }} + {{ goodsBrand.name }} @@ -119,17 +119,17 @@ @@ -149,7 +149,7 @@ 全选 取消全选 -
已选 {{ selectNum }} 件
+
已选 {{ selectNum }} 件
确 定 取 消 @@ -245,7 +245,14 @@ export default { this.group.change_data = changeData; this.$refs.group.validate((valid) => { if (valid) { + const loading = this.$loading({ + lock: true, + text: 'Loading', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }); addGroup(this.group).then((res) => { + loading.close(); this.$message(res.data.message); this.$router.push({ path: "GROUP_MANAGEMENT" }); }) diff --git a/resources/frontend/src/views/group/editGroup.vue b/resources/frontend/src/views/group/editGroup.vue index d8d6a5f..e2c0131 100644 --- a/resources/frontend/src/views/group/editGroup.vue +++ b/resources/frontend/src/views/group/editGroup.vue @@ -24,7 +24,7 @@ 全部 - {{ goodsType.name }} + {{ goodsType.name }}
全部 - {{ goodsType.name }} + {{ goodsType.name }} 全部 - {{ goodsBrand.name }} + {{ goodsBrand.name }} @@ -118,17 +118,17 @@ @@ -148,7 +148,7 @@ 全选 取消全选 -
已选 {{ selectNum }} 件
+
已选 {{ selectNum }} 件
确 定 取 消 @@ -254,9 +254,16 @@ export default { this.group.delete_ids = this.groupGoodsSearch.delete_ids; this.$refs.group.validate((valid) => { if (valid) { + const loading = this.$loading({ + lock: true, + text: 'Loading', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }); editGroup(this.groupGoodsSearch.group_id, this.group).then((res) => { + loading.close(); this.$message(res.data.message); - // this.$router.push({ path: "GROUP_MANAGEMENT" }); + this.$router.push({ path: "GROUP_MANAGEMENT" }); }) } else { return false;