diff --git a/app/admin/logic/store_product/StoreProductLogic.php b/app/admin/logic/store_product/StoreProductLogic.php
index a26b5bf96..59f7c655f 100644
--- a/app/admin/logic/store_product/StoreProductLogic.php
+++ b/app/admin/logic/store_product/StoreProductLogic.php
@@ -49,8 +49,8 @@ class StoreProductLogic extends BaseLogic
                 'purchase' => $params['purchase'],
                 'rose' => $params['rose'],
                 'is_return' => $params['is_return'],
-                'swap' => $params['swap']??0,
-                'batch' => $params['batch']??0,
+                'swap' => $params['swap'] ?? 0,
+                'batch' => $params['batch'] ?? 0,
             ];
             // if ($params['rose'] > 0) {
             //     $rose_price = bcmul($params['cost'], $params['rose'], 2);
@@ -106,10 +106,9 @@ class StoreProductLogic extends BaseLogic
                 StoreProductCate::where('id', $item['id'])->update(['delete_time' => time()]);
             }
 
-            if($item['pid'] == 0 && in_array($item['count'],[0,1])){
+            if ($item['pid'] == 0 && in_array($item['count'], [0, 1])) {
                 StoreProductCate::where('id', $item['id'])->update(['delete_time' => time()]);
             }
-
         }
     }
 
@@ -151,38 +150,41 @@ class StoreProductLogic extends BaseLogic
                 'vip_price' => $params['vip_price'],
                 'cost' => $params['cost'],
                 'batch' => $params['batch'],
-                'swap' => $params['swap']??0,
+                'swap' => $params['swap'] ?? 0,
 
-        ];
+            ];
 
-        StoreProduct::where('id', $params['id'])->update($data);
-        $old_cate = StoreBranchProduct::where('product_id', $params['id'])->field('cate_id,store_id')
-            ->select();
-
-        // 获取分类ID
-        foreach ($old_cate as $vv) {
-            $related_data = Db::name('store_product_cate')->where('cate_id', $vv['cate_id'])->select();
-            //删除之前的分类
-            foreach ($related_data as $value) {
-                if ($value['count'] == 1) {
-                    self::deleteRelatedData($value['cate_id']);
-                } elseif ($value['count'] > 1) {
-                    self::decreaseCount($value['cate_id']);
+            StoreProduct::where('id', $params['id'])->update($data);
+            $old_cate = StoreBranchProduct::where('product_id', $params['id'])->field('cate_id,store_id')
+                ->select();
+            StoreBranchProduct::where('product_id', $params['id'])
+                ->update([
+                    'batch' => $params['batch'], 'price' => $params['price'], 'vip_price' => $params['vip_price'], 'cost' => $params['purchase'], 'store_name' => $params['store_name'], 'image' => $params['image'], 'bar_code' => $params['bar_code']
+                ]);
+            // 获取分类ID
+            foreach ($old_cate as $vv) {
+                $related_data = Db::name('store_product_cate')->where('cate_id', $vv['cate_id'])->select();
+                //删除之前的分类
+                foreach ($related_data as $value) {
+                    if ($value['count'] == 1) {
+                        self::deleteRelatedData($value['cate_id']);
+                    } elseif ($value['count'] > 1) {
+                        self::decreaseCount($value['cate_id']);
+                    }
+                    //新增对应的分类
+                    self::updateGoodsclass($params['cate_id'], $value['store_id']);
                 }
-                //新增对应的分类
-                self::updateGoodsclass($params['cate_id'], $value['store_id']);
             }
-        }
 
 
-        //修改
-        StoreBranchProduct::where('product_id', $params['id'])->update([
-            'price' => $params['price'], 'vip_price' => $params['vip_price'],
-            'cost' => $params['cost'], 'cate_id' => $params['cate_id']
-        ]);
+            //修改
+            StoreBranchProduct::where('product_id', $params['id'])->update([
+                'price' => $params['price'], 'vip_price' => $params['vip_price'],
+                'cost' => $params['cost'], 'cate_id' => $params['cate_id']
+            ]);
 
             Db::commit();
-        return true;
+            return true;
         } catch (\Exception $e) {
             Db::rollback();
             self::setError($e->getMessage());