Merge branch 'master' into dev

app-ghs/controllers/ConsoleController.php

@@ -172,7 +172,7 @@ class ConsoleController extends BaseController
             }
         }
 
-        //$notice[] = ['title' => '因批发店越来越多，有问题优先在自己的群、官方群反馈。除非涉及隐私，直接发消息给小石将减少回应，直到没有回应，请谅解。', 'action' => '', 'page' => ''];
+        $notice[] = ['title' => '母亲节订单较多，新订单通知会延迟。', 'action' => '', 'page' => ''];
         //$notice[] = ['title' => '新功能：客户端和后台使用跑腿的流程', 'action' => '', 'page' => '/admin/book/detail?id=use_pt'];
 
         $mainId = $this->mainId;

app-ghs/controllers/RenewController.php

@@ -44,13 +44,16 @@ class RenewController extends BaseController
         $deadline = $shop->deadline ?? '';
         $newTime = bcadd(strtotime($deadline), 31536000);
         $newDeadline = date("Y-m-d H:i:s", $newTime);
+        $newTime5 = bcadd(strtotime($deadline), bcmul('31536000', '5'));
+        $newDeadline5 = date("Y-m-d H:i:s", $newTime5);
 
         $old = substr($deadline, 0, 11);
         $new = substr($newDeadline, 0, 11);
+        $new5 = substr($newDeadline5, 0, 11);
 
         $hasRenew = $shop->hasRenew ?? 0;
 
-        util::success(['need' => $need, 'currentDeadline' => $old, 'newDeadline' => $new, 'hasRenew' => $hasRenew, 'renewType' => $renewType]);
+        util::success(['need' => $need, 'currentDeadline' => $old, 'newDeadline' => $new, 'newDeadline5' => $new5, 'hasRenew' => $hasRenew, 'renewType' => $renewType]);
     }
 
     //当天不需要再提醒 ssh 20240426