From 834395ca75be8f70aa6b549524a15a213f52b343 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E4=B8=96=E7=95=8C?= <642747453@qq.com> Date: Wed, 24 Aug 2022 10:35:44 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20#20220824=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Console/Commands/Inventory.php | 37 ++++++++++--------- app/Http/Controllers/User/UsersController.php | 2 +- app/Listeners/UpdateBusinessGoodsStock.php | 2 +- app/Models/Log.php | 6 ++- app/Services/Business/BusinessClient.php | 2 +- ...05_093629_create_business_orders_table.php | 2 +- 6 files changed, 27 insertions(+), 24 deletions(-) diff --git a/app/Console/Commands/Inventory.php b/app/Console/Commands/Inventory.php index 40d5de3..450b0dc 100644 --- a/app/Console/Commands/Inventory.php +++ b/app/Console/Commands/Inventory.php @@ -43,34 +43,35 @@ class Inventory extends Command { DB::beginTransaction(); try { - // 数据库存储过程,7点定时执行 - $skus = GoodsSku::query()->get(['id', 'stock', 'two_days_ago_num', 'yesterday_num']); - $data = []; - $date = date('Y-m-d'); - foreach ($skus as $sku) { - $data[] = [ - 'sku_id' => $sku->id, - 'day' => $date, - ]; - GoodsSku::where('id', $sku->id)->update([ - 'stock' => $sku->stock + $sku->two_days_ago_num + $sku->yesterday_num, - 'yesterday_num' => $sku->stock, - 'two_days_ago_num' => $sku->two_days_ago_num + $sku->yesterday_num, - ]); - } $log = new Log(); $log->module = 'goods'; $log->action = 'PATCH'; $log->target_type = 'goods_sku'; $log->target_id = 0; $log->target_field = 'timingInventory'; - $log->user_id = 1; + $log->user_id = 999; + // 数据库存储过程,7点定时执行 + $data = []; + $date = date('Y-m-d'); + GoodsSku::chunk(500, static function ($skus) use (&$data, $date) { + foreach ($skus as $sku) { + $data[] = [ + 'sku_id' => $sku->id, + 'day' => $date, + ]; + GoodsSku::where('id', $sku->id)->update([ + 'stock' => $sku->stock + $sku->two_days_ago_num + $sku->yesterday_num, + 'yesterday_num' => $sku->stock, + 'two_days_ago_num' => $sku->two_days_ago_num + $sku->yesterday_num, + ]); + } + }); $record = new DailyStockRecord(); $record->batchInsert($data); - $log->message = '成功'; DB::commit(); + $log->message = '7点数据更新成功'; } catch (\Exception $exception) { - $log->message = '失败' . $exception->getMessage(); + $log->message = '7点数据更新失败' . $exception->getMessage(); DB::rollBack(); } $log->save(); diff --git a/app/Http/Controllers/User/UsersController.php b/app/Http/Controllers/User/UsersController.php index b7b2e31..2d82602 100644 --- a/app/Http/Controllers/User/UsersController.php +++ b/app/Http/Controllers/User/UsersController.php @@ -24,7 +24,7 @@ class UsersController extends Controller public function index(Request $request) { - $users = User::query()->where('id', '<>', 1)->with('roles:id,name,guard_name')->paginate($request->get('per_page')); + $users = User::query()->whereNotIn('id', [1, 999])->with('roles:id,name,guard_name')->paginate($request->get('per_page')); return UsersResource::collection($users); } diff --git a/app/Listeners/UpdateBusinessGoodsStock.php b/app/Listeners/UpdateBusinessGoodsStock.php index b8d43bc..a05be02 100644 --- a/app/Listeners/UpdateBusinessGoodsStock.php +++ b/app/Listeners/UpdateBusinessGoodsStock.php @@ -39,7 +39,7 @@ class UpdateBusinessGoodsStock implements ShouldQueue $log->target_type = 'goods_sku'; $log->target_id = $event->goodsSku->id ?? 0; $log->target_field = 'stock'; - $log->user_id = 1; + $log->user_id = 999; $log->message = ($event->businessOrderItem['external_sku_id'] ?? $event->businessOrderItem['id']) . '未找到'; $log->save(); diff --git a/app/Models/Log.php b/app/Models/Log.php index fd99ae2..74ed88d 100644 --- a/app/Models/Log.php +++ b/app/Models/Log.php @@ -91,7 +91,7 @@ class Log extends Model 'stock' => '库存', 'inventory' => '库存盘点', 'reserve' => '预留量 ', - 'timingInventory' => '7店盘点 ', + 'timingInventory' => '7点盘点', 'pdd.ktt.goods.query.list' => '快团团下载绑定商品', 'arrived_today_num' => '今日到货', 'loss_num' => '损耗', @@ -99,6 +99,8 @@ class Log extends Model 'reference_price' => '参考价格', 'update' => '更新', 'pdd.ktt.goods.incr.quantity' => '快团团库存同步', + 'pdd.ktt.order.list' => '快团团下载订单', + 'pdd.ktt.increment.order.query' => '快团团增量下载订单' ]; return $map[$value] ?? $value; @@ -111,7 +113,7 @@ class Log extends Model public function add($targetId = 0, $targetField = '') { - $this->attributes['user_id'] = Auth::id() ?? 1; + $this->attributes['user_id'] = Auth::id() ?? 999; $this->attributes['target_id'] = $targetId; $this->attributes['target_field'] = $targetField; diff --git a/app/Services/Business/BusinessClient.php b/app/Services/Business/BusinessClient.php index 1064a23..db2bf79 100644 --- a/app/Services/Business/BusinessClient.php +++ b/app/Services/Business/BusinessClient.php @@ -148,7 +148,7 @@ abstract class BusinessClient $log->target_type = $this->getShop()->plat_id . '--' . $this->getShop()->name; $log->target_id = $this->getShop()->id; $log->target_field = $params['type']; - $log->user_id = Auth::id() ?? 1; + $log->user_id = Auth::id() ?? 999; if ($size < 64000) { $log->message = json_encode($res, 256); } diff --git a/database/migrations/2022_08_05_093629_create_business_orders_table.php b/database/migrations/2022_08_05_093629_create_business_orders_table.php index 94ef6ef..3398bed 100644 --- a/database/migrations/2022_08_05_093629_create_business_orders_table.php +++ b/database/migrations/2022_08_05_093629_create_business_orders_table.php @@ -17,7 +17,7 @@ class CreateBusinessOrdersTable extends Migration $table->bigIncrements('id'); $table->integer('shop_id'); $table->string('activity_no')->nullable(); - $table->string('activity_title')->nullable(); + $table->text('activity_title')->nullable(); $table->bigInteger('after_sales_status')->nullable(); $table->string('business_note')->nullable(); $table->string('buyer_memo')->nullable();