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

!252 修复bug

Browse Source 
Merge pull request !252 from 杨建炊/fix-release-1.0.0/yjc-migrate
This commit is contained in:
杨建炊 2024-11-14 11:33:26 +00:00 committed by Gitee
commit 86ba51dc6f
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/Goods/GoodsSkusController.php
View File

@ -83,7 +83,7 @@ class GoodsSkusController extends Controller
$id = $businessOrderItem['goods_sku']['id']; $id = $businessOrderItem['goods_sku']['id'];
if ($businessOrderItem['goods_sku']['is_combination']) { if ($businessOrderItem['goods_sku']['is_combination']) {
foreach ($businessOrderItem['goods_sku']['combination_goods'] ?? [] as $combinationGoods) { foreach ($businessOrderItem['goods_sku']['combination_goods'] ?? [] as $combinationGoods) {
$ids[$combinationGoods['item_id']] = $ids[$combinationGoods['item_id']] ?? 0 $ids[$combinationGoods['item_id']] = ($ids[$combinationGoods['item_id']] ?? 0)
+ ((int)$businessOrderItem['number']) * $combinationGoods['item_num']; + ((int)$businessOrderItem['number']) * $combinationGoods['item_num'];
$externals[$combinationGoods['item_id']][] = $businessOrderItem; $externals[$combinationGoods['item_id']][] = $businessOrderItem;
} }
@ -97,7 +97,6 @@ class GoodsSkusController extends Controller
$externals[$id][] = $businessOrderItem; $externals[$id][] = $businessOrderItem;
} }
$builder = GoodsSku::query(); $builder = GoodsSku::query();
$this->preparQueryGoodsSkus($request, $builder); $this->preparQueryGoodsSkus($request, $builder);
$day = DateTimeUtils::getToday(); $day = DateTimeUtils::getToday();

7
app/Services/GoodSku/GoodSkuService.php
View File

@ -101,9 +101,11 @@ class GoodSkuService
public function handleSkusWithCombinationGoods(array $skusWithCombinationGoods) public function handleSkusWithCombinationGoods(array $skusWithCombinationGoods)
{ {
//查询sku当前未发货的数量 需要扣减 //查询sku当前未发货的数量 需要扣减
$externalSkuIds = collect($skusWithCombinationGoods)->pluck("external_sku_id")->toArray(); //$externalSkuIds = collect($skusWithCombinationGoods)->pluck("external_sku_id")->toArray();
//默认只查15天内未发货的数据 //默认只查15天内未发货的数据
$startTime = Carbon::now()->subDays(15)->startOfDay()->toDateTimeString(); $unshippedData = [];
//发货状态异常 先关闭扣减
/*$startTime = Carbon::now()->subDays(15)->startOfDay()->toDateTimeString();
$unshippedDataCollect = BusinessOrderItem::query() $unshippedDataCollect = BusinessOrderItem::query()
->leftJoin("business_orders as b", "business_order_id", "=", "b.id") ->leftJoin("business_orders as b", "business_order_id", "=", "b.id")
->select("external_sku_id", DB::raw("sum(goods_number) as goods_total"), DB::raw("sum(already_cancel_number) as cancel_total")) ->select("external_sku_id", DB::raw("sum(goods_number) as goods_total"), DB::raw("sum(already_cancel_number) as cancel_total"))
@ -112,6 +114,7 @@ class GoodSkuService
->groupBy('external_sku_id')->get()->toArray(); ->groupBy('external_sku_id')->get()->toArray();
$unshippedData = collect($unshippedDataCollect)->pluck(null, "external_sku_id")->toArray(); $unshippedData = collect($unshippedDataCollect)->pluck(null, "external_sku_id")->toArray();
Log::info("15日内未发货数据", $unshippedData); Log::info("15日内未发货数据", $unshippedData);
*/
return collect($skusWithCombinationGoods)->map(function ($v) use ($unshippedData) { return collect($skusWithCombinationGoods)->map(function ($v) use ($unshippedData) {
$v['real_stock'] = $v['inventory'] ?? null; $v['real_stock'] = $v['inventory'] ?? null;
if (!empty($unshippedData[$v['external_sku_id']]) && isset($v['inventory'])) { if (!empty($unshippedData[$v['external_sku_id']]) && isset($v['inventory'])) {