Merge branch 'master' into dev

app-ghs/controllers/ConsoleController.php

@@ -175,7 +175,7 @@ class ConsoleController extends BaseController
         //$notice[] = ['title' => '客户多个订单开始支持一键分享', 'action' => '查看', 'page' => '/admin/book/detail?id=calc'];
         //$notice[] = ['title' => '急事请连续打二次电话 15280215347', 'action' => '', 'page' => ''];
         //$notice[] = ['title' => '新功能：客户端和后台使用跑腿的流程', 'action' => '', 'page' => '/admin/book/detail?id=use_pt'];
-        //$notice[] = ['title' => '新上超级计算器功能，请看视频', 'action' => '查看', 'page' => '/admin/book/detail?id=calc'];
+        $notice[] = ['title' => '分享订单打不开的解决办法', 'action' => '查看', 'page' => '/admin/book/detail?id=calc'];
 
         $mainId = $this->mainId;
         $respond = StatSaleClass::profile($mainId);

app-ghs/controllers/PurchaseController.php

@@ -5,6 +5,7 @@ namespace ghs\controllers;
 use biz\ghs\classes\GhsClass;
 use bizGhs\order\classes\PurchaseOrderClass;
 use bizGhs\order\services\PurchaseOrderService;
+use bizHd\purchase\classes\PurchaseClass;
 use common\components\dateUtil;
 use common\components\util;
 use Yii;
@@ -12,6 +13,29 @@ use Yii;
 class PurchaseController extends BaseController
 {
 
+    public $guestAccess = ['get-cg-salt'];
+
+    /**
+     * 分享跳转花店采购详情时，按 xhCg 主键取 salt（无需登录）
+     */
+    public function actionGetCgSalt()
+    {
+        $get = Yii::$app->request->get();
+        $id = intval($get['id'] ?? 0);
+        if (empty($id)) {
+            util::fail('采购单无效');
+        }
+        $cg = PurchaseClass::getById($id, true);
+        if (empty($cg)) {
+            util::fail('没有找到采购单');
+        }
+        $salt = $cg->salt ?? '';
+        if (empty($salt)) {
+            util::fail('采购单信息无效');
+        }
+        util::success(['salt' => $salt]);
+    }
+
     //待结款明细 ssh 2021.1.26
     public function actionDebtList()
     {

app-hd/controllers/GhsController.php

@@ -472,10 +472,10 @@ class GhsController extends BaseController
         $city = $shop->city ?? '';
         $address = $shop->address ?? '';
 
-        //noticeUtil::push("有新花店上来 {$this->shopId} {$toLat} {$toLnt} {$locationType} {$city}{$address}", '15280215347');
+        noticeUtil::push("有新花店上来 {$this->shopId} {$toLat} {$toLnt} {$locationType} {$city}{$address}", '15280215347');
 
         // 找出附近批发店，之后自动给建立关系，然后补充二个店之间的距离
-        GhsClass::buildNearbyGhsRelations($this->shopId, $this->shop->pfShopId ?? 0, $toLat, $toLnt);
+        //GhsClass::buildNearbyGhsRelations($this->shopId, $this->shop->pfShopId ?? 0, $toLat, $toLnt);
 
         //noticeUtil::push("花店 {$name} {$mobile} 新注册，已推荐批发店", '15280215347');
 

app-pt/views/main/app.php

@@ -235,8 +235,8 @@
             }
             // 这里可以根据appType跳转到对应的下载链接
             const downloadUrls = {
-                'xiaohuabao': 'https://api.shop.hzghd.com/1290.apk', // 销花宝APP下载链接
-                'huazhanggui': 'https://api.shop.hzghd.com/237.apk', // 花掌柜APP下载链接
+                'xiaohuabao': 'https://api.shop.hzghd.com/1291.apk', // 销花宝APP下载链接
+                'huazhanggui': 'https://api.shop.hzghd.com/238.apk', // 花掌柜APP下载链接
                 'huazhanggui_cashier': 'https://api.shop.hzghd.com/200.apk', // 花掌柜收银下载链接
                 'xiaohuabao_cashier': 'https://api.shop.hzghd.com/159.apk' // 销花宝收银下载链接
             };

common/components/book.php

@@ -63,7 +63,7 @@ class book
             ['title' => '微信和支付宝开户认证', 'id' => 'upgrade'],
             ['title' => '换卡和新开收款账户收费标准', 'id' => 'changeCard'],
             ['title' => '公司地址', 'id' => 'aboutUs'],
-            ['title' => '多个订单开始支持一键分享', 'id' => 'calc'],
+            ['title' => '分享订单打不开解决办法', 'id' => 'calc'],
         ]],
     ];