shish 2 сар өмнө
parent
commit
ac9ab2dd58

+ 2 - 1
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;

+ 3 - 2
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]);
     }