yjc/erp
1
0
Fork 0
mirror of https://gitee.com/hzchunfen/erp.git synced 2025-12-01 06:30:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: #20220824 优化

Browse Source
This commit is contained in:
赵世界 2022-08-24 10:35:44 +08:00
parent 2653ab54a9
commit 834395ca75
6 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/Console/Commands/Inventory.php
View File

@ -43,10 +43,17 @@ class Inventory extends Command
{
DB::beginTransaction();
try {
$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 = 999;
// 数据库存储过程,7点定时执行
$skus = GoodsSku::query()->get(['id', 'stock', 'two_days_ago_num', 'yesterday_num']);
$data = [];
$date = date('Y-m-d');
GoodsSku::chunk(500, static function ($skus) use (&$data, $date) {
foreach ($skus as $sku) {
$data[] = [
'sku_id' => $sku->id,
@ -58,19 +65,13 @@ class Inventory extends Command
'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;
});
$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();

2
app/Http/Controllers/User/UsersController.php
View File

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

2
app/Listeners/UpdateBusinessGoodsStock.php
View File

@ -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();

6
app/Models/Log.php
View File

@ -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;

2
app/Services/Business/BusinessClient.php
View File

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

2
database/migrations/2022_08_05_093629_create_business_orders_table.php
View File

@ -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();