From 31d4826466229f826ae486af5e0da3563438e99d Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Tue, 23 Jul 2024 11:00:59 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0'rose'=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E5=88=B0=E4=BA=A7=E5=93=81=E5=BA=93=E5=AD=98=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/logic/store_product/StoreProductLogic.php | 2 ++
 app/queue/redis/StoreStorageSend.php                | 1 +
 2 files changed, 3 insertions(+)

diff --git a/app/admin/logic/store_product/StoreProductLogic.php b/app/admin/logic/store_product/StoreProductLogic.php
index a6bfde633..d5ca3b83d 100644
--- a/app/admin/logic/store_product/StoreProductLogic.php
+++ b/app/admin/logic/store_product/StoreProductLogic.php
@@ -182,6 +182,7 @@ class StoreProductLogic extends BaseLogic
                 'batch' => $params['batch'],
                 'manufacturer_information' => $params['manufacturer_information']??'',
                 'swap' => $params['swap'] ?? 0,
+                'rose' => $params['rose'] ?? 0,
             ];
 
             StoreProduct::where('id', $params['id'])->update($data);
@@ -213,6 +214,7 @@ class StoreProductLogic extends BaseLogic
                 'top_cate_id'=>$dealCate['top_cate_id'],'two_cate_id'=>$dealCate['two_cate_id'],
                 'bar_code'=> $params['bar_code'],
                 'purchase'=> $params['purchase'],
+                'rose'=> $params['rose']??0,
             ]);
 
             Db::commit();
diff --git a/app/queue/redis/StoreStorageSend.php b/app/queue/redis/StoreStorageSend.php
index 04f5ad9ba..cadd9e7cb 100644
--- a/app/queue/redis/StoreStorageSend.php
+++ b/app/queue/redis/StoreStorageSend.php
@@ -69,6 +69,7 @@ class StoreStorageSend implements Consumer
                     'sales' => 0,
                     'product_type' => $find['product_type'],
                     'stock' => 0,
+                    'rose' => $find['rose'],
                 ];
                 $branch = StoreBranchProduct::create($product);
                 $arr = [