From 8b39a9e635b29a67dececa516ddcc5d236300e4b Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Thu, 13 Jun 2024 15:15:24 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E4=BB=B7=E6=A0=BC?=
 =?UTF-8?q?=E5=92=8C=E4=BC=9A=E5=91=98=E4=BB=B7=E6=A0=BC=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logic/store_product/StoreProductLogic.php   | 17 ++++++++++-------
 app/queue/redis/StoreStorageSend.php            |  1 -
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/admin/logic/store_product/StoreProductLogic.php b/app/admin/logic/store_product/StoreProductLogic.php
index 1e95deedd..5f0f40ae7 100644
--- a/app/admin/logic/store_product/StoreProductLogic.php
+++ b/app/admin/logic/store_product/StoreProductLogic.php
@@ -42,25 +42,28 @@ class StoreProductLogic extends BaseLogic
                 'cate_id' => $params['cate_id'],
                 'unit' => $params['unit'],
                 'stock' => $params['stock'],
+                'price' => $params['price'],
+                'vip_price' => $params['vip_price'],
                 'cost' => $params['cost'],
                 'purchase' => $params['purchase'],
                 'rose' => $params['rose'],
                 'is_return' => $params['is_return'],
             ];
-            if ($params['rose'] > 0) {
-                $rose_price = bcmul($params['cost'], $params['rose'], 2);
-                $data['price'] = bcadd($params['cost'], $rose_price, 2);
-            } else {
-                $data['price'] = 0;
-            }
+            // if ($params['rose'] > 0) {
+            //     $rose_price = bcmul($params['cost'], $params['rose'], 2);
+            //     $data['price'] = bcadd($params['cost'], $rose_price, 2);
+            // } else {
+            //     $data['price'] = 0;
+            // }
             $res = StoreProduct::create($data);
             StoreProductAttrValue::create([
                 "bar_code" => $params["bar_code"] ?? '',
                 "image" => $params["image"] ?? '',
+                "price" => $params['price'],
+                'vip_price' => $params['vip_price'],
                 "cost" => $params['cost'],
                 "purchase" => $params['purchase'],
                 "unit" => $params["unit"],
-                "price" => $data['price'],
                 "stock" => $params['stock'],
                 "product_id" => $res['id'],
                 "unique" => setUnique($res['id'], '', 0),
diff --git a/app/queue/redis/StoreStorageSend.php b/app/queue/redis/StoreStorageSend.php
index 7ceab499a..a96e88ad4 100644
--- a/app/queue/redis/StoreStorageSend.php
+++ b/app/queue/redis/StoreStorageSend.php
@@ -47,7 +47,6 @@ class StoreStorageSend implements Consumer
                     'price' => $find['price'],
                     'cost' => $find['cost'],
                     'vip_price' => $find['vip_price'],
-                    'vip_ot_price' => $find['vip_ot_price'],
                     'unit' => $find['unit'],
                     'store_id' => $store_id,
                     'sales' => 0,