门店修改问题

app-ghs/controllers/ShopController.php

@@ -48,7 +48,7 @@ class ShopController extends BaseController
         }
         ShopClass::valid($shop, $this->sjId);
         $data['img'] = isset($data['img']) && is_array($data['img']) ? json_encode($data['img']) : '';
-        ShopClass::updateShop($id, $data);
+        ShopClass::updateShop($shop, $data);
         util::complete();
     }
 

app-hd/controllers/ShopController.php

@@ -44,7 +44,7 @@ class ShopController extends BaseController
         $shop = ShopService::getById($id);
         ShopService::valid($shop, $this->sjId);
         $data['img'] = isset($data['img']) && is_array($data['img']) ? json_encode($data['img']) : '';
-        ShopService::updateShop($id, $data);
+        ShopService::updateShop($shop, $data);
         util::complete();
     }
 

app-mall/controllers/PublicController.php

@@ -5,12 +5,8 @@ namespace mall\controllers;
 use bizHd\wx\classes\WxOpenClass;
 use common\components\baseController;
 use common\components\dict;
-use common\components\httpUtil;
 use Yii;
 
-/**
- * 前台公共类
- */
 class PublicController extends baseController
 {
 

biz-ghs/merchant/classes/ShopClass.php

@@ -74,8 +74,9 @@ class ShopClass extends BaseClass
     }
 
     //更新门店 ssh 2020.2.29
-    public static function updateShop($id, $data)
+    public static function updateShop($shop, $data)
     {
+        $id = $shop['id'] ?? 0;
         $shopName = isset($data['shopName']) ? $data['shopName'] : '';
         if (stringUtil::getWordNum($shopName) > 8) {
             util::fail('门店名称不能超过8个汉字，2个字母顶一个汉字');
@@ -90,7 +91,8 @@ class ShopClass extends BaseClass
         $floor = $data['floor'] ?? '';
         $address = $data['address'] ?? '';
         $data['fullAddress'] = $prefix . $dist . $address . $floor;
-        return self::updateById($id, $data);
+        $respond = self::updateById($id, $data);
+        return $respond;
     }
 
     //取商家所有门店 ssh 2020.2.29

biz-ghs/order/classes/OrderClass.php

@@ -527,12 +527,13 @@ class OrderClass extends BaseClass
     //修改订单表的配送信息 linqh 2021.3.28
     public static function updateCustomExpressInfo($id, $expressAddInfo)
     {
+        $prefix = $expressAddInfo['province'] == $expressAddInfo['city'] ? $expressAddInfo['province'] : $expressAddInfo['province'] . $expressAddInfo['city'];
         $data = [
             'province' => $expressAddInfo['province'],
             'city' => $expressAddInfo['city'],
             'address' => $expressAddInfo['address'],
             'floor' => $expressAddInfo['floor'],
-            'fullAddress' => $expressAddInfo['province'] . $expressAddInfo['city'] . $expressAddInfo['address'] . $expressAddInfo['floor'],
+            'fullAddress' => $prefix . $expressAddInfo['address'] . $expressAddInfo['floor'],
             'lat' => $expressAddInfo['lat'],
             'long' => $expressAddInfo['long'],
             'sendTime' => $expressAddInfo['sendTime'],

biz-hd/merchant/classes/ShopClass.php

@@ -57,8 +57,9 @@ class ShopClass extends BaseClass
     }
 
     //更新门店 ssh 2020.2.29
-    public static function updateShop($id, $data)
+    public static function updateShop($shop, $data)
     {
+        $id = $shop['id'] ?? 0;
         $shopName = isset($data['shopName']) ? $data['shopName'] : '';
         $sjId = $data['sjId'];
         if (stringUtil::getWordNum($shopName) > 8) {

biz-hd/merchant/services/ShopService.php

@@ -61,9 +61,9 @@ class ShopService extends BaseService
 	}
 
 	//更新门店 ssh 2020.2.29
-	public static function updateShop($id, $data)
+	public static function updateShop($shop, $data)
 	{
-		return ShopClass::updateShop($id, $data);
+		return ShopClass::updateShop($shop, $data);
 	}
 	
 	//删除门店 ssh 2020.3.1

biz/wx/classes/WxMessageClass.php

@@ -71,8 +71,10 @@ class WxMessageClass extends BaseClass
                     util::fail('没有找到微信平台信息');
                 }
                 $templateId = $item->templateId;
-                $r = wxUtil::delTMessage($wx, $templateId, $ptStyle);
-                print_r($r);die;
+                $respond = wxUtil::delTMessage($wx, $templateId, $ptStyle);
+                if (isset($respond['errcode']) && $respond['errcode'] == 0) {
+                    $item->delete();
+                }
             }
         }
         $tMessageList = dict::getDict('tMessage');