Merge branch 'master' of http://git.huaml.com/zhh/huahuibao

app-ghs/controllers/ProductController.php

@@ -11,6 +11,7 @@ use biz\admin\classes\AdminRoleClass;
 use bizGhs\admin\classes\AdminClass;
 use bizGhs\item\classes\ItemClass;
 use bizGhs\item\classes\ItemClassClass;
+use bizGhs\merchant\classes\ShopClass;
 use bizGhs\product\classes\ProductClass;
 use bizGhs\product\services\ProductService;
 use bizGhs\item\services\ItemService;
@@ -314,6 +315,10 @@ class ProductController extends BaseController
             ];
             ProductClass::updateByCondition($where, $data);
             ProductClass::autoPriceById($id);
+
+            //2021.7.6 linqh 如果是首店，则更新全部分店
+            ProductClass::updateSyncProduct($id,$this->shopId,$data);
+
         }
         util::complete();
     }

biz-ghs/product/classes/ProductClass.php

@@ -511,21 +511,7 @@ class ProductClass extends BaseClass
         //判断是否首店
         $shopInfo = ShopClass::getById($shopId);
         $res = ProductClass::updateByCondition(['id' => $id, 'shopId' => $shopId], ['price' => $price, 'priceLabel' => $priceLabel]);
-        $productData = ProductClass::getById($id);
-        $itemId = $productData['itemId'];
-        if($shopInfo['default']==1){
-            //首店
-            $sjId = $shopInfo['sjId'];
-            $shopAll = ShopClass::getAllShop($sjId);
-            if($shopAll){
-                foreach ($shopAll as $s){
-                    if($s['id'] != $shopId){
-                        ProductClass::updateByCondition(['itemId' => $itemId, 'shopId' => $s['id']], ['price' => $price, 'priceLabel' => $priceLabel]);
-                    }
-                }
-            }
-
-        }
+        self::updateSyncProduct($id,$shopId,['price' => $price, 'priceLabel' => $priceLabel]);
         return $res;
     }
 
@@ -691,22 +677,8 @@ class ProductClass extends BaseClass
         }
         self::updateById($id, $upData);
 
-        //如果是首店，则更新全部分店
-        $shopId = $model['shopId'];
-        $shopInfo = ShopClass::getById($shopId);
-        $itemId = $model['itemId'];
-        if($shopInfo['default']==1){
-            //首店
-            $sjId = $shopInfo['sjId'];
-            $shopAll = ShopClass::getAllShop($sjId);
-            if($shopAll){
-                foreach ($shopAll as $s){
-                    if($s['id'] != $shopId){
-                        ProductClass::updateByCondition(['itemId' => $itemId, 'shopId' => $s['id']], $upData);
-                    }
-                }
-            }
-        }
+        //2021.7.6 linqh 如果是首店，则更新全部分店
+        self::updateSyncProduct($id, $model['shopId'],$upData);
     }
 
     //自动改价 2021.4.14
@@ -923,4 +895,23 @@ class ProductClass extends BaseClass
 
     }
 
+    //2021.7.6 修改花材同步其他分店
+    public static function updateSyncProduct($productId,$shopId,$upData)
+    {
+        $shopInfo = ShopClass::getById($shopId);
+        $productData = ProductClass::getById($productId);
+        $itemId = $productData['itemId'];
+        if($shopInfo['default']==1){
+            //首店
+            $sjId = $shopInfo['sjId'];
+            $shopAll = ShopClass::getAllShop($sjId);
+            if($shopAll){
+                foreach ($shopAll as $s){
+                    if($s['id'] != $shopId){
+                        ProductClass::updateByCondition(['itemId' => $itemId, 'shopId' => $s['id']], $upData);
+                    }
+                }
+            }
+        }
+    }
 }