修改推送模版消息

.env

@@ -31,6 +31,7 @@ MESSAGE_CHARGER_TIMEOUT=f0DDXSxvRTbHyzkCnwnYijtgteFTdfdUR7J8REwTYJ8
 MESSAGE_RELOAD=t_PyOGCKN_fmD0blw0EuIQs-8sS3qOTmpQay12haPZY
 MESSAGE_SHED_TIMEOUT=rdzTNQ7t4uRXkP0SkuwW10WH77A_CIgYFiJykXJ0utU
 MESSAGE_CHARGER_SHED=C0LvfETe-1rCR_IhOydDGPTUwwYkrWZxgfwMsETrhw8
+MESSAGE_CHARGER_FULL=f0DDXSxvRTbHyzkCnwnYijtgteFTdfdUR7J8REwTYJ8
 DOWNLOAD_HOST=https://cdzpay.test.senthink.com
 LOW_POWER_LIMIT=30
 PAY_HOST=https://cdzpay.test.senthink.com

application/controller/card/PayRuleController.php

@@ -12,6 +12,7 @@ namespace Application\controller\card;
 use Application\controller\Controller;
 use Application\model\BillTmpModel;
 
+use Application\model\StationModel;
 use GatewayWorker\Lib\Gateway;
 use Lib\log\Log;
 
@@ -32,17 +33,26 @@ class PayRuleController extends Controller
     {
 
         $billingTmp = new BillTmpModel();
+        $stationModel = new StationModel();
 
         if (isset($_SESSION['station_id']) == false) {
             Gateway::closeClient($this->clientId);
 
         }
-        $rule = $billingTmp->getColumn('context', 'id = ' . $_SESSION['station_id']);
+        $rule = $stationModel->getColumns(['billing_template2', 'billingTpl_id'], 'id = ' . $_SESSION['station_id']);
+
+        Log::debug('station', $rule);
+
+        if ($rule['billing_template2'] === null) {
+            $rule = $billingTmp->getColumn('context', 'id = ' . $rule['billingTpl_id']);
+
+        } else {
+            $rule = $rule['billing_template2'];
+        }
+
         if (isset($rule)) {
             $rule = json_decode($rule, true);
-
             $back = [];
-
             $count = count($rule);
 
             foreach ($rule as $item) {

readme.md

+#  staging:54.222.172.6 8282
+# test: 52.80.115.117 8283