diff --git a/app/Http/Controllers/Goods/GoodsCombinationController.php b/app/Http/Controllers/Goods/GoodsCombinationController.php index 7cf441a..d5efd00 100644 --- a/app/Http/Controllers/Goods/GoodsCombinationController.php +++ b/app/Http/Controllers/Goods/GoodsCombinationController.php @@ -95,8 +95,11 @@ class GoodsCombinationController extends Controller $item['children'] = $items; unset($item['combinationGoods']); } + $rolesName = $request->user()->getRoleNames()->toArray(); + $data = ["manage" => ["is_admin" => in_array($rolesName[0] + , ["运营", "超级管理员", "管理员", "系统管理员", "店铺运营"]) ? 1 : 0]]; - return GoodsSkuResource::collection($skus); + return GoodsSkuResource::collection($skus)->additional($data); } public function store(Request $request) @@ -115,8 +118,8 @@ class GoodsCombinationController extends Controller } $externalSkuId = $request->input('external_sku_id') ?? GeneratorUtils::generateCombinationGoodNumber($request->combination_goods); - $hasCodeSku = GoodsSku::query()->where("external_sku_id",$externalSkuId)->first(); - if(!empty($hasCodeSku)){ + $hasCodeSku = GoodsSku::query()->where("external_sku_id", $externalSkuId)->first(); + if (!empty($hasCodeSku)) { throw new \Exception("该组合商品编码已存在"); } DB::beginTransaction(); diff --git a/app/Http/Controllers/Goods/GoodsSkusController.php b/app/Http/Controllers/Goods/GoodsSkusController.php index b6281fc..303e7df 100644 --- a/app/Http/Controllers/Goods/GoodsSkusController.php +++ b/app/Http/Controllers/Goods/GoodsSkusController.php @@ -133,13 +133,15 @@ class GoodsSkusController extends Controller $sku['cost'] = 0; } + if (!empty($sku['yesterday_num'])) { $sku['sale_ratio'] = round($sku['stock'] / $sku['yesterday_num'], 2) * 100; } else { $sku['sale_ratio'] = 0; } } - return GoodsSkuResource::collection($goodsSkus); + $data = ["manage"=>["is_admin"=>in_array($rolesName[0],["运营","超级管理员","管理员","系统管理员","店铺运营"])?1:0]]; + return GoodsSkuResource::collection($goodsSkus)->additional($data); } private function preparQueryGoodsSkus(Request $request, &$builder)