Merge branch 'master' of git.huaml.com:zhh/huahuibao

app-hd/controllers/ClearController.php

@@ -14,7 +14,7 @@ class ClearController extends BaseController
 {
 
 
-    public $guestAccess = ['get-full-info'];
+    public $guestAccess = ['get-full-info', 'detail'];
 
     //取消结账单 ssh 20220509
     public function actionCancel()

app-hd/controllers/OrderController.php

@@ -409,7 +409,14 @@ class OrderController extends BaseController
             //打印小票和语音播报
             $id = $return->id ?? 0;
             $order = OrderClass::getById($id, true);
-            OrderClass::onlinePrint($order);
+
+            //商家自己开的微信、门店和美团单，默认不打小票，其它情况打小票
+            if ($order->fromType == 1 || $order->fromType == 3 || $order->fromType == 4) {
+
+            } else {
+                OrderClass::onlinePrint($order);
+            }
+
             ShopExtClass::hdGatheringReport($order);
 
             if (isset($order->status) && $order->status == 1) {

app-hd/controllers/PurchaseClearController.php

@@ -12,6 +12,8 @@ use common\components\util;
 class PurchaseClearController extends BaseController
 {
 
+    public $guestAccess = ['wx-pay'];
+
     //生成结帐订单 ssh 2021.1.26
     public function actionCreateOrder()
     {
@@ -80,6 +82,11 @@ class PurchaseClearController extends BaseController
         $totalFee = $order->actPrice;
         //强制使用小程序的miniOpenId
         $openId = isset($this->admin) && !empty($this->admin) ? $this->admin->miniOpenId : '';
+        if (empty($openId)) {
+            if (isset($post['currentMiniOpenId']) && !empty($post['currentMiniOpenId'])) {
+                $openId = $post['currentMiniOpenId'];
+            }
+        }
         if (empty($openId)) {
             util::fail('没有openId');
         }

app-hd/controllers/PurchaseController.php

@@ -24,6 +24,8 @@ use common\components\util;
 class PurchaseController extends BaseController
 {
 
+    public $guestAccess = ['detail'];
+
     //生成采购单 ssh 2021.1.17
     public function actionCreateOrder()
     {
@@ -201,7 +203,7 @@ class PurchaseController extends BaseController
         $id = $get['id'] ?? 0;
         $info = PurchaseService::getInfo($id, true, true);
         if (isset($info['mainId']) == false || $info['mainId'] != $this->mainId) {
-            util::fail('没有权限访问');
+            //util::fail('没有权限访问');
         }
 
         $customId = $info['customId'] ?? 0;