diff --git a/app/Console/Commands/CheckSkuQualityPeriod.php b/app/Console/Commands/CheckSkuQualityPeriod.php index 4f76c1e..017a29c 100644 --- a/app/Console/Commands/CheckSkuQualityPeriod.php +++ b/app/Console/Commands/CheckSkuQualityPeriod.php @@ -49,11 +49,12 @@ class CheckSkuQualityPeriod extends Command //查询未处理过的快过期的异常订单 $purchaseRecords = DB::table('purchase_records as a') - ->select("a.created_at", "a.num", "b.title", "b.stock", "a.id", "b.id as sku_id", "b.external_sku_id") - ->leftJoin('goods_skus as b', 'a.sku_id', '=', 'b.id') + ->select("a.created_at","a.date", "a.num", "b.title", "b.stock", "a.id", "b.id as sku_id", "b.external_sku_id") + ->leftJoin('goods_skus as b', 'a.external_sku_id', '=', 'b.external_sku_id') ->where("a.check_status", "=", 0) ->whereBetween('a.expire_time', [$startTime, $endTime])->get(); - Log::info('purchaseRecords', (array)$purchaseRecords); + Log::info('采购临期记录', [$purchaseRecords]); + if ($purchaseRecords->isNotEmpty()) { $messageService = new MessageService(); $updateIds = []; @@ -67,7 +68,6 @@ class CheckSkuQualityPeriod extends Command } $updateIds[] = $v->id; //更新下状态 - } PurchaseRecords::query()->whereIn('id', $updateIds)->update([ "check_status" => 1 diff --git a/app/Listeners/BusinessOrderUpdateListener.php b/app/Listeners/BusinessOrderUpdateListener.php index c78b7f5..c69b861 100644 --- a/app/Listeners/BusinessOrderUpdateListener.php +++ b/app/Listeners/BusinessOrderUpdateListener.php @@ -47,7 +47,9 @@ class BusinessOrderUpdateListener implements ShouldQueue if (!empty($event->goodsSku)) { //查询库存是否满足告警规则 //查找昨日统计的库存数据 - $inventory = $event->goodsSku['yesterday_num'] ?? 0; + $record = DailyStockRecord::query()->where('sku_id', $event->goodsSku->id)->where("inventory", '>', 0)->orderByDesc('day')->first(); + Log::info("库存告警record", [$record]); + $inventory = $record->inventory ?? 0; $expireTime = Carbon::now()->addMinutes(30)->toDateTimeString(); $proportion = Cache::remember(CacheKeyEnum::STOCK_RULE_PROPORTION, $expireTime, function () { $developerConfig = DeveloperConfig::query()->where("key", "=", DevConfigKeyEnum::STOCK_RULE_PROPORTION)->first(); diff --git a/app/Services/Business/KuaiTuanTuan/Goods.php b/app/Services/Business/KuaiTuanTuan/Goods.php index b243b7e..3fa454f 100644 --- a/app/Services/Business/KuaiTuanTuan/Goods.php +++ b/app/Services/Business/KuaiTuanTuan/Goods.php @@ -4,7 +4,9 @@ namespace App\Services\Business\KuaiTuanTuan; use App\Events\BusinessOrdersUpdate; use App\Models\BusinessGoodsSku; +use App\Models\GoodsSku; use App\Services\Business\BusinessFactory; +use Illuminate\Support\Facades\Log; class Goods { @@ -43,6 +45,16 @@ class Goods ); if (empty($businessGoodSku->id)) { $businessGoodSku->save(); + if (!empty($businessGoodSku->external_sku_id)) { + $shop = $businessGoodSku->shop; + $sku = GoodsSku::query() + ->where('external_sku_id', $businessGoodSku->external_sku_id) + ->first(); + Log::info("商品下载新增sku",[$businessGoodSku]); + if(!empty($sku)){ + BusinessFactory::init()->make($shop['plat_id'])->setShopWithId($shop['id'])->incrQuantity($businessGoodSku, $sku->sale_stock, false); + } + } } else { $businessGoodSku->update($data); } diff --git a/public/nginx.htaccess b/public/nginx.htaccess new file mode 100644 index 0000000..67728b1 --- /dev/null +++ b/public/nginx.htaccess @@ -0,0 +1 @@ +try_files $uri $uri/ /index.php?$query_string; \ No newline at end of file