From f9c066228260431a5ac1271685474114c0df22bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E5=BB=BA=E7=82=8A?= <924182103@qq.com>
Date: Sat, 7 Sep 2024 16:46:29 +0800
Subject: [PATCH] =?UTF-8?q?=E9=B2=9C=E8=8A=B12.0-=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/Goods/GoodsCombinationController.php     | 9 ++++++---
 app/Http/Controllers/Goods/GoodsSkusController.php       | 4 +++-
 2 files changed, 9 insertions(+), 4 deletions(-)

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)