From 374787b57cac3c2a8e95df56a23f824b26a7a8a5 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, 24 Aug 2024 14:23:06 +0800
Subject: [PATCH] =?UTF-8?q?=E9=B2=9C=E8=8A=B12.0-=E6=96=87=E6=A1=88?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Shop/ShopsController.php | 2 +-
 app/Models/Log.php                            | 4 ++++
 app/Services/GoodSku/GoodSkuService.php       | 2 +-
 resources/lang/zh-CN/permission.php           | 4 ++--
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/Shop/ShopsController.php b/app/Http/Controllers/Shop/ShopsController.php
index 43f407a..2d03652 100644
--- a/app/Http/Controllers/Shop/ShopsController.php
+++ b/app/Http/Controllers/Shop/ShopsController.php
@@ -52,7 +52,7 @@ class ShopsController extends Controller
         $validator = Validator::make($request->all(), [
             'name' => 'required|string|max:191|unique:shops,name',
             'plat_id' => 'required|integer',
-            'ratio' => 'required',
+            'ratio' => 'sometimes|default:*1',
         ]);
         if ($validator->fails()) {
             $this->setValidatorFailResponse($validator->getMessageBag()->getMessages());
diff --git a/app/Models/Log.php b/app/Models/Log.php
index eb5c829..6d7ca90 100644
--- a/app/Models/Log.php
+++ b/app/Models/Log.php
@@ -72,6 +72,9 @@ class Log extends Model
             'kuaituantuan' => '快团团',
             'miaoxuan' => '妙选',
             'goods' => '商品',
+            "sku_stock_purchase" => "入库采购",
+            "sku_stock_loss" => "报损记录",
+            "sku_stock_inventory" => "盘点记录",
         ];
 
         return $map[$value] ?? $value;
@@ -89,6 +92,7 @@ class Log extends Model
             'set' => '设置',
             'cost' => '成本',
             'stock' => '库存',
+            'sale_stock' => '在售库存',
             'inventory' => '库存盘点',
             'reserve' => '预留量 ',
             'timingInventory' => '7点盘点',
diff --git a/app/Services/GoodSku/GoodSkuService.php b/app/Services/GoodSku/GoodSkuService.php
index 036df5c..8915d1c 100644
--- a/app/Services/GoodSku/GoodSkuService.php
+++ b/app/Services/GoodSku/GoodSkuService.php
@@ -172,7 +172,7 @@ class GoodSkuService
     {
         $userId =  Auth::id();
         $costLog = [
-            'module' => 'goodSkus',
+            'module' => 'goods',
             'action' => "POST",
             'target_type' => $targetType,
             'target_id' => $goodsSkuItem['id'] ?? 0,
diff --git a/resources/lang/zh-CN/permission.php b/resources/lang/zh-CN/permission.php
index 4ea6183..43fd8ca 100644
--- a/resources/lang/zh-CN/permission.php
+++ b/resources/lang/zh-CN/permission.php
@@ -203,7 +203,7 @@ return [
         'id' => 13,
         'name' => '团购管理',
         'parent_id' => 0,
-        'show' => 1,
+        'show' => 0,
     ],
     'group.index' => [
         'id' => 130,
@@ -447,7 +447,7 @@ return [
         'id' => 17,
         'name' => '电子面单',
         'parent_id' => 12,
-        'show' => 1,
+        'show' => 0,
     ],
     'shop_ship.index' => [
         'id' => 170,