Merge branch 'master' into dev

app-hd/controllers/MainController.php

@@ -292,7 +292,8 @@ class MainController extends BaseController
         if (isset($shop->avatar) && !empty($shop->avatar)) {
             $shopImg = Yii::$app->params['ghsImgHost'] . $shop->avatar;
         }
-        $deadline = $sj['deadline'] ?? '';
+        // 到期时间取当前门店 xhShop.deadline（续费、业务校验均以此为准）
+        $deadline = $shop->deadline ?? '';
         $relation = isset($this->shopAdmin) && !empty($this->shopAdmin) ? $this->shopAdmin->attributes : [];
         $adminName = $relation['name'] ?? '';
         $eId = $relation['id'] ?? 0;

app-hd/controllers/RechargeController.php

@@ -448,8 +448,9 @@ class RechargeController extends BaseController
     //续期成功 ssh 2021.2.21
     public function actionRenewSuccess()
     {
-        $sj = $this->sj->attributes;
-        $deadline = date("Y-m-d H:i", strtotime($sj['deadline']));
+        $shop = $this->shop;
+        $deadline = $shop->deadline ?? '';
+        $deadline = date("Y-m-d H:i", strtotime($deadline));
         util::success(['deadline' => $deadline]);
     }
 

biz-ghs/order/classes/OrderClass.php

@@ -3045,7 +3045,7 @@ XL;
         /**************************如果是好多花的云仓还要再打一下标签纸，多处要同步修改，关键词 hdh_yc *****************************/
         $orderMainId = $order->mainId;
         if (getenv('YII_ENV') == 'production') {
-            $map = [65726, 58, 25119, 28500, 1294, 12925, 2644];
+            $map = [65726, 58, 25119, 28500, 1294, 12925, 2644,10652,2084];
         } else {
             $map = [828];
         }
@@ -3070,7 +3070,7 @@ XL;
             }
         }
         //东莞我要花 福州福清我要花 手机后四号变星号
-        if (in_array((int)$orderMainId, [25119, 2644], true)) {
+        if (in_array((int)$orderMainId, [25119, 2644,10652,2084], true)) {
             $customMobile = preg_replace('/(.{4})$/u', '****', trim($customMobile));
         }
         $customName = $order->customName ?? '';