From a2b121462ca37b9fafbe6857c674dc6dee2a4b43 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Wed, 28 Aug 2024 16:43:08 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E7=8A=B6=E6=80=81=E7=9A=84API=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../store_product/StoreProductController.php  | 10 ++++++
 .../logic/store_product/StoreProductLogic.php | 35 ++++++++++++++++---
 2 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/app/admin/controller/store_product/StoreProductController.php b/app/admin/controller/store_product/StoreProductController.php
index 50cc68465..55c5f43d7 100644
--- a/app/admin/controller/store_product/StoreProductController.php
+++ b/app/admin/controller/store_product/StoreProductController.php
@@ -62,6 +62,16 @@ class StoreProductController extends BaseAdminController
         
     }
 
+    /**
+     * @notes 修改商品状态
+     * @return \think\response\Json
+     * @date 2024/05/31 10:53
+     */
+    public function status(){
+        $params=$this->request->post();
+        StoreProduct::where('id',$params['id'])->update(['is_show'=>$params['is_show']]);
+        return $this->success('操作成功',[],1,1);
+    }
 
     /**
      * @notes 删除商品列表
diff --git a/app/admin/logic/store_product/StoreProductLogic.php b/app/admin/logic/store_product/StoreProductLogic.php
index 875b9cc96..d8f28f88f 100644
--- a/app/admin/logic/store_product/StoreProductLogic.php
+++ b/app/admin/logic/store_product/StoreProductLogic.php
@@ -36,6 +36,16 @@ class StoreProductLogic extends BaseLogic
      */
     public static function add(array $params): bool
     {
+        $count=count($params['cate_arr']);
+        $top_cate_id=0;
+        $two_cate_id=0;
+        if($count==3){
+            $top_cate_id=$params['cate_arr'][0];
+            $two_cate_id=$params['cate_arr'][1];
+        }elseif($count==2){
+            $top_cate_id=$params['cate_arr'][0];
+            $two_cate_id=$params['cate_arr'][0];
+        }
         Db::startTrans();
         try {
             $data = [
@@ -43,6 +53,8 @@ class StoreProductLogic extends BaseLogic
                 'image' => $params['image'],
                 'store_info' => $params['store_info'] ?? '',
                 'bar_code' => $params['bar_code'] ?? '',
+                'top_cate_id' => $top_cate_id,
+                'two_cate_id' => $two_cate_id,
                 'cate_id' => $params['cate_id'],
                 'unit' => $params['unit'],
                 'stock' => 0,
@@ -57,6 +69,7 @@ class StoreProductLogic extends BaseLogic
                 'batch' => $params['batch'] ?? 0,
                 'store_batch' => $params['store_batch'] ?? 1,
                 'product_type' => $params['product_type'] ?? 0,
+                'is_show' => $params['is_show'] ?? 0,
             ];
             // if ($params['rose'] > 0) {
             //     $rose_price = bcmul($params['cost'], $params['rose'], 2);
@@ -171,11 +184,23 @@ class StoreProductLogic extends BaseLogic
     {
         Db::startTrans();
         try {
+            $count=count($params['cate_arr']);
+            $top_cate_id=0;
+            $two_cate_id=0;
+            if($count==3){
+                $top_cate_id=$params['cate_arr'][0];
+                $two_cate_id=$params['cate_arr'][1];
+            }elseif($count==2){
+                $top_cate_id=$params['cate_arr'][0];
+                $two_cate_id=$params['cate_arr'][0];
+            }
             $data = [
                 'store_name' => $params['store_name'],
                 'image' => $params['image'],
                 'bar_code' => $params['bar_code'] ?? '',
                 'store_info' => $params['store_info'] ?? '',
+                'top_cate_id' => $top_cate_id,
+                'two_cate_id' => $two_cate_id,
                 'cate_id' => $params['cate_id'],
                 'unit' => $params['unit'],
                 'stock' => $params['stock'],
@@ -189,12 +214,12 @@ class StoreProductLogic extends BaseLogic
                 'store_batch' => $params['store_batch'] ?? 1,
                 'manufacturer_information' => $params['manufacturer_information'] ?? '',
                 'swap' => $params['swap'] ?? 0,
-                'rose' => $params['rose'] ?? 0,
+                'is_show' => $params['is_show'] ?? 0,
             ];
 
             StoreProduct::where('id', $params['id'])->update($data);
 
-            $dealCate = self::dealChangeCate($params['cate_id']);
+            // $dealCate = self::dealChangeCate($params['cate_id']);
             //修改
             StoreBranchProduct::where('product_id', $params['id'])->update([
                 'price' => $params['price'],
@@ -206,11 +231,13 @@ class StoreProductLogic extends BaseLogic
                 'manufacturer_information' => $params['manufacturer_information'] ?? '',
                 'store_info' => $params['store_info'] ?? '',
                 'cate_id' => $params['cate_id'],
-                'top_cate_id' => $dealCate['top_cate_id'],
-                'two_cate_id' => $dealCate['two_cate_id'],
+                'top_cate_id' => $top_cate_id,
+                'two_cate_id' => $two_cate_id,
+                'cate_id' => $params['cate_id'],
                 'bar_code' => $params['bar_code'],
                 'purchase' => $params['purchase'],
                 'rose' => $params['rose'] ?? 0,
+                'status' => $params['is_show'] ?? 0,
                 'image' => $params['image'],
                 'store_batch' => $params['store_batch'] ?? 1,