yjc/erp
1
0
Fork 0
mirror of https://gitee.com/hzchunfen/erp.git synced 2025-11-30 22:20:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

鲜花2.0-文案调整

Browse Source
This commit is contained in:
杨建炊 2024-08-21 18:30:30 +08:00
parent 70442ebbac
commit 6e8ca109fc
4 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,7 +25,7 @@ class GoodsCombinationController extends Controller
$skus = GoodsSku::query() $skus = GoodsSku::query()
->with([ ->with([
'combinationGoods:id,goods_sku_id,item_id,item_num', 'combinationGoods:id,goods_sku_id,item_id,item_num',
'combinationGoods.goodsSkuItem:id,goods_id,title,stock,external_sku_id,updated_at,yesterday_num,reference_price,status', 'combinationGoods.goodsSkuItem:id,goods_id,title,stock,sale_stock,external_sku_id,updated_at,yesterday_num,reference_price,status',
'combinationGoods.goodsSkuItem.goods:id,title,img_url', 'combinationGoods.goodsSkuItem.goods:id,title,img_url',
]) ])
->where('is_combination', 1) ->where('is_combination', 1)
@ -76,6 +76,7 @@ class GoodsCombinationController extends Controller
'reference_price' => $combinationItem['goodsSkuItem']['reference_price'], 'reference_price' => $combinationItem['goodsSkuItem']['reference_price'],
'status' => $combinationItem['goodsSkuItem']['status'], 'status' => $combinationItem['goodsSkuItem']['status'],
'stock' => $combinationItem['goodsSkuItem']['stock'], 'stock' => $combinationItem['goodsSkuItem']['stock'],
'sale_stock' => $combinationItem['goodsSkuItem']['sale_stock'],
'thumb_url' => $combinationItem['goodsSkuItem']['goods']['img_url'], 'thumb_url' => $combinationItem['goodsSkuItem']['goods']['img_url'],
'img_url' => $combinationItem['goodsSkuItem']['goods']['img_url'], 'img_url' => $combinationItem['goodsSkuItem']['goods']['img_url'],
'title' => $combinationItem['goodsSkuItem']['goods']['title'] . $combinationItem['goodsSkuItem']['title'], 'title' => $combinationItem['goodsSkuItem']['goods']['title'] . $combinationItem['goodsSkuItem']['title'],

6
app/Http/Controllers/Goods/GoodsController.php
View File

@ -56,9 +56,9 @@ class GoodsController extends Controller
$item['goods_id'] = $goods->id; $item['goods_id'] = $goods->id;
$item['stock'] = $item['num'] ?? 0; $item['stock'] = $item['num'] ?? 0;
$item['reference_price'] = $item['cost'] * 1.5; $item['reference_price'] = $item['cost'] * 1.5;
$item['sku_code'] = !empty($item['sku_code']) ? $item['sku_code'] : $goodService->getRandomCode(); $item['sku_code'] = !empty($item['external_sku_id']) ? $item['external_sku_id'] : $goodService->getRandomCode();
$item['external_sku_id'] = $goods->goods_code . '_' .$item['sku_code']; $item['external_sku_id'] = !empty($item['external_sku_id']) ? $item['external_sku_id'] : ($goods->goods_code . '_' . $item['sku_code']);
$item['name'] = $goods->title ." ". $item['title']; $item['name'] = $goods->title . " " . $item['title'];
$goodsSkus[] = $item; $goodsSkus[] = $item;
} }

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

@ -18,6 +18,7 @@ use App\Models\Goods;
use App\Models\Log; use App\Models\Log;
use App\Models\Log as LogModel; use App\Models\Log as LogModel;
use App\Services\DeveloperConfig\DeveloperConfigService; use App\Services\DeveloperConfig\DeveloperConfigService;
use App\Services\Good\GoodService;
use App\Services\GoodSku\GoodSkuService; use App\Services\GoodSku\GoodSkuService;
use App\Services\Ship\WayBillService; use App\Services\Ship\WayBillService;
use App\Utils\ArrayUtils; use App\Utils\ArrayUtils;
@ -198,8 +199,8 @@ class GoodsSkusController extends Controller
$sku = GoodsSku::query()->find($id); $sku = GoodsSku::query()->find($id);
$this->setBeforeUpdateForLog($sku->toArray()); $this->setBeforeUpdateForLog($sku->toArray());
$skuInfo = $request->sku; $skuInfo = $request->sku;
$skuInfo['external_sku_id'] = $request->goods['goods_code'] . '_' . $request->sku['sku_code']; $goodService = new GoodService();
$skuInfo['name'] = $request->goods['title'] . $request->sku['title']; $skuInfo['name'] = $goodService->getTypeFormatName($request->goods['type_id']) . $request->sku['title'];
$sku->update($skuInfo); $sku->update($skuInfo);
$this->setAfterUpdateForLog($sku->toArray()); $this->setAfterUpdateForLog($sku->toArray());
$this->addLog($id, 'update'); $this->addLog($id, 'update');
@ -257,6 +258,7 @@ class GoodsSkusController extends Controller
*/ */
private function saleStock($request) private function saleStock($request)
{ {
$updateIds = [];
DB::beginTransaction(); DB::beginTransaction();
try { try {
$logs = []; $logs = [];
@ -276,11 +278,14 @@ class GoodsSkusController extends Controller
$goodsSku->save(); $goodsSku->save();
$costLog['after_update'] = $goodsSku->sale_stock; $costLog['after_update'] = $goodsSku->sale_stock;
$logs[] = $costLog; $logs[] = $costLog;
$updateIds[] = $sku['id'];
} }
$log = new LogModel(); $log = new LogModel();
$log->batchInsert($logs); $log->batchInsert($logs);
DB::commit(); DB::commit();
if(!empty($updateIds)){
event(new BatchStockUpdateEvent($updateIds));
}
} catch (\Exception $exception) { } catch (\Exception $exception) {
DB::rollBack(); DB::rollBack();
$this->res = [ $this->res = [

11
app/Services/Good/GoodService.php
View File

@ -33,6 +33,17 @@ class GoodService
return Goods::query()->firstOrCreate($params, $saveData); return Goods::query()->firstOrCreate($params, $saveData);
} }
public function getTypeFormatName($typeId)
{
$goodsType = GoodsType::query()->with("parentType")->where('id', "=", $typeId)
->first()->toArray();
$parentName = "";
if (!empty($goodsType['parent_type']['name'])) {
$parentName = $goodsType['parent_type']['name'] ?? '';
}
return $goodsType['name'] . " " .$parentName;
}
public function getRandomCode() public function getRandomCode()
{ {
$time = time(); $time = time();