Merge branch 'master' into zhongqi-itemUpdate

app-ghs/controllers/ConsoleController.php

@@ -172,8 +172,9 @@ class ConsoleController extends BaseController
             }
         }
 
-        //$notice[] = ['title' => '因批发店越来越多，有问题优先在自己的群、官方群反馈。除非涉及隐私，直接发消息给小石将减少回应，直到没有回应，请谅解。', 'action' => '', 'page' => ''];
+        //$notice[] = ['title' => '母亲节订单较多，新订单通知会延迟。', 'action' => '', 'page' => ''];
         //$notice[] = ['title' => '新功能：客户端和后台使用跑腿的流程', 'action' => '', 'page' => '/admin/book/detail?id=use_pt'];
+        $notice[] = ['title' => '过二天，收银机点花材名字可增加数量。', 'action' => '查看', 'page' => '/admin/book/detail?id=casherUpdate'];
 
         $mainId = $this->mainId;
         $respond = StatSaleClass::profile($mainId);

app-ghs/controllers/MainController.php

@@ -246,9 +246,11 @@ class MainController extends BaseController
             $showAd = 0;
         }
         //没有登录不显示广告
-        if(empty($this->mainId)){
+        if (empty($this->mainId)) {
             $showAd = 0;
         }
+        //是否展示终身版套餐
+        $lifelong = 0;
 
         $deadline = $sj['deadline'] ?? '';
         $relation = isset($this->shopAdmin) && !empty($this->shopAdmin) ? $this->shopAdmin->attributes : [];
@@ -278,6 +280,7 @@ class MainController extends BaseController
             'fast1' => '17189513228',
             'fast2' => '15280215347',
             'showAd' => $showAd,
+            'lifelong' => $lifelong,
         ];
         util::success($data);
     }

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

app-pt/views/main/app.php

@@ -237,8 +237,8 @@
             const downloadUrls = {
                 'xiaohuabao': 'https://api.shop.hzghd.com/1279.apk', // 销花宝APP下载链接
                 'huazhanggui': 'https://api.shop.hzghd.com/234.apk', // 花掌柜APP下载链接
-                'huazhanggui_cashier': 'https://api.shop.hzghd.com/199.apk', // 花掌柜收银下载链接
-                'xiaohuabao_cashier': 'https://api.shop.hzghd.com/157.apk' // 销花宝收银下载链接
+                'huazhanggui_cashier': 'https://api.shop.hzghd.com/200.apk', // 花掌柜收银下载链接
+                'xiaohuabao_cashier': 'https://api.shop.hzghd.com/159.apk' // 销花宝收银下载链接
             };
             const url = downloadUrls[appType];
             if (url && url !== '#') {

biz-ghs/order/classes/OrderClass.php

@@ -1915,7 +1915,8 @@ class OrderClass extends BaseClass
         }
 
         if (isset($orderInfo['actPrice']) && $orderInfo['actPrice'] == 0 && $orderInfo['book'] == 0) {
-            util::fail('已全额退款，不能打小票');
+            //全额退款了，也要能打小票
+            //util::fail('已全额退款，不能打小票');
         }
 
         $showItem = OrderClass::getShowItem(true, $orderInfo);

common/components/book.php

@@ -63,6 +63,7 @@ class book
             ['title' => '微信和支付宝开户认证', 'id' => 'upgrade'],
             ['title' => '换卡和新开收款账户收费标准', 'id' => 'changeCard'],
             ['title' => '公司地址', 'id' => 'aboutUs'],
+            ['title' => '收银机改进', 'id' => 'casherUpdate'],
         ]],
     ];
 
@@ -278,6 +279,9 @@ class book
             ['style' => 'info', 'value' => '地址：斗南花花世界1号馆5045室，具体位置如下',],
             ['style' => 'image', 'value' => 'gs2.jpg',],
         ],
+        'casherUpdate'=>[
+            ['style' => 'video', 'value' => 'jc/casher_update.mp4'],
+        ],
     ];
 
 }