feat: #10000 前端打包

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,
+                    'start_time' => strtotime($request->datetimerange[0]) * 1000,
-                    'end_time' => $group->end_time,
+                    '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,
+                    'start_time' => strtotime($request->datetimerange[0]) * 1000,
-                    'end_time' => $group->end_time,
+                    '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'];

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);
         }

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,

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 重构异常处理

resources/frontend/src/views/group/addGroup.vue

@@ -24,7 +24,7 @@
                         <el-radio-group v-model="groupGoodsSearch.type_id" size="small" @change="getGroupGoodsList()">
                             <el-radio-button label="0">全部</el-radio-button>
                             <el-radio-button v-for="goodsType in types" :key="goodsType.id" :label="goodsType.id">
-                                {{       goodsType.name       }}</el-radio-button>
+                                {{ goodsType.name }}</el-radio-button>
                         </el-radio-group>
                     </div>
                     <el-table ref="multipleTableGroup" v-loading="groupLoading" :data="groupGoods.data" border
@@ -92,14 +92,14 @@
                     <el-radio-group v-model="goodsList.type_id" size="small" @change="goodsSearch()">
                         <el-radio-button label="0">全部</el-radio-button>
                         <el-radio-button v-for="goodsType in types" :key="goodsType.id" :label="goodsType.id">
-                            {{       goodsType.name       }}</el-radio-button>
+                            {{ goodsType.name }}</el-radio-button>
                     </el-radio-group>
                 </el-form-item>
                 <el-form-item label="商品品牌" prop="brand_id">
                     <el-radio-group v-model="goodsList.brand_id" size="small" @change="goodsSearch()">
                         <el-radio-button label="0">全部</el-radio-button>
                         <el-radio-button v-for="goodsBrand in brands" :key="goodsBrand.id" :label="goodsBrand.id">
-                            {{       goodsBrand.name       }}</el-radio-button>
+                            {{ goodsBrand.name }}</el-radio-button>
                     </el-radio-group>
                 </el-form-item>
                 <el-form-item label="搜索" prop="goods_keyword">
@@ -119,17 +119,17 @@
                 </el-table-column>
                 <el-table-column label="商品信息">
                     <template slot-scope="scope">
-                        {{       scope.row.goods.title + ' ' + scope.row.title       }}
+                        {{ scope.row.goods.title + ' ' + scope.row.title }}
                     </template>
                 </el-table-column>
                 <el-table-column label="编码">
                     <template slot-scope="scope">
-                        {{       scope.row.goods.goods_code + '_' + scope.row.sku_code       }}
+                        {{ scope.row.goods.goods_code + '_' + scope.row.sku_code }}
                     </template>
                 </el-table-column>
                 <el-table-column label="品牌">
                     <template slot-scope="scope">
-                        {{       scope.row.goods.brand ? scope.row.goods.brand.name : ''       }}
+                        {{ scope.row.goods.brand ? scope.row.goods.brand.name : '' }}
                     </template>
                 </el-table-column>
                 <el-table-column prop="goods.type.name" label="分类">
@@ -149,7 +149,7 @@
                         <el-button @click="toggleSelection(1)">全选</el-button>
                         <el-button @click="toggleSelection(0)">取消全选</el-button>
                     </div>
-                    <div>已选 {{       selectNum       }} 件</div>
+                    <div>已选 {{ selectNum }} 件</div>
                     <div>
                         <el-button type="primary" @click="addGoods();">确 定</el-button>
                         <el-button @click="centerDialogVisible = false">取 消</el-button>
@@ -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" });
                     })

resources/frontend/src/views/group/editGroup.vue

@@ -24,7 +24,7 @@
                         <el-radio-group v-model="groupGoodsSearch.type_id" size="small" @change="getGroupGoodsList()">
                             <el-radio-button label="0">全部</el-radio-button>
                             <el-radio-button v-for="goodsType in types" :key="goodsType.id" :label="goodsType.id">
-                                {{   goodsType.name   }}</el-radio-button>
+                                {{ goodsType.name }}</el-radio-button>
                         </el-radio-group>
                     </div>
                     <el-table ref="multipleTableGroup" v-loading="groupLoading" :data="groupGoods.data" border
@@ -91,14 +91,14 @@
                     <el-radio-group v-model="goodsList.type_id" size="small" @change="goodsSearch()">
                         <el-radio-button label="0">全部</el-radio-button>
                         <el-radio-button v-for="goodsType in types" :key="goodsType.id" :label="goodsType.id">
-                            {{   goodsType.name   }}</el-radio-button>
+                            {{ goodsType.name }}</el-radio-button>
                     </el-radio-group>
                 </el-form-item>
                 <el-form-item label="商品品牌" prop="brand_id">
                     <el-radio-group v-model="goodsList.brand_id" size="small" @change="goodsSearch()">
                         <el-radio-button label="0">全部</el-radio-button>
                         <el-radio-button v-for="goodsBrand in brands" :key="goodsBrand.id" :label="goodsBrand.id">
-                            {{   goodsBrand.name   }}</el-radio-button>
+                            {{ goodsBrand.name }}</el-radio-button>
                     </el-radio-group>
                 </el-form-item>
                 <el-form-item label="搜索" prop="goods_keyword">
@@ -118,17 +118,17 @@
                 </el-table-column>
                 <el-table-column label="商品信息">
                     <template slot-scope="scope">
-                        {{   scope.row.goods.title + ' ' + scope.row.title   }}
+                        {{ scope.row.goods.title + ' ' + scope.row.title }}
                     </template>
                 </el-table-column>
                 <el-table-column label="编码">
                     <template slot-scope="scope">
-                        {{   scope.row.goods.goods_code + '_' + scope.row.sku_code   }}
+                        {{ scope.row.goods.goods_code + '_' + scope.row.sku_code }}
                     </template>
                 </el-table-column>
                 <el-table-column label="品牌">
                     <template slot-scope="scope">
-                        {{   scope.row.goods.brand ? scope.row.goods.brand.name : ''   }}
+                        {{ scope.row.goods.brand ? scope.row.goods.brand.name : '' }}
                     </template>
                 </el-table-column>
                 <el-table-column prop="goods.type.name" label="分类">
@@ -148,7 +148,7 @@
                         <el-button @click="toggleSelection(1)">全选</el-button>
                         <el-button @click="toggleSelection(0)">取消全选</el-button>
                     </div>
-                    <div>已选 {{   selectNum   }} 件</div>
+                    <div>已选 {{ selectNum }} 件</div>
                     <div>
                         <el-button type="primary" @click="addGoods();">确 定</el-button>
                         <el-button @click="centerDialogVisible = false">取 消</el-button>
@@ -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;