Merge branch 'master' into minus

biz/shop/classes/ShopClass.php

@@ -167,12 +167,34 @@ class ShopClass extends BaseClass
         ];
         $where = ['sjId' => $sjId, 'shopId' => $id];
         if ($ptStyle == dict::getDict('ptStyle', 'ghs')) {
+            //如果是批发店，更新供货商信息
             GhsClass::updateByCondition($where, $shopUpdate);
         }
+        if ($ptStyle == 1) {
+            //如果是花店，更新客户端信息
+            $city = $data['city'] ?? '';
+            $dist = $data['dist'] ?? '';
+            $address = $data['address'] ?? '';
+            $floor = $data['floor'] ?? '';
+            $fullAddress = $city . $dist . $address . $floor;
+            $showAddress = $data['showAddress'] ?? '';
+            $lat = $data['lat'] ?? '';
+            $long = $data['long'] ?? '';
+            $upData = ['city' => $city,
+                'dist' => $dist,
+                'address' => $address,
+                'floor' => $floor,
+                'fullAddress' => $fullAddress,
+                'showAddress' => $showAddress,
+                'lat' => $lat,
+                'long' => $long
+            ];
+            CustomClass::updateByCondition(['shopId' => $id], $upData);
+        }
         return $respond;
     }
 
-    //取商家所有门店 ssh 2020.2.29
+    //取商家所有门店 ssh 2020.2.30
     public static function getAllShop($sjId)
     {
         return self::getAllByCondition(['sjId' => $sjId], null, "*");