Merge branch 'payBack' into dev

app-hd/controllers/OrderController.php

@@ -1232,7 +1232,7 @@ class OrderController extends BaseController
             util::fail('没有找到订单信息');
         }
         if (empty($salt)) {
-            util::fail('请求参数错误');
+            util::fail('请求参数错误呢');
         }
         if ($detail['salt'] != $salt) {
             util::fail('不是你的订单');

app-hd/controllers/PurchaseController.php

@@ -1098,19 +1098,23 @@ class PurchaseController extends BaseController
         if (empty($info)) {
             util::fail('没有找到采购单');
         }
-        if (empty($this->shopId)) {
-            $salt = $get['salt'] ?? '';
-            if (empty($salt)) {
-                util::fail('请求参数错误');
-            }
+
+        $salt = $get['salt'] ?? '';
+        if (!empty($salt)) {
             if (empty($info['salt']) || $info['salt'] != $salt) {
-                util::fail('没有找到采购单');
+                util::fail('无效采购单呢！！');
+            }
+        } else {
+            if (empty($this->shopId)) {
+                util::fail('暂时无法查看采购单。');
+            }
+            if (empty($info['mainId']) || $info['mainId'] != $this->mainId) {
+                //不能注释，分享付款功能要用，客户没有登录也能付款
+                //util::fail('无法访问');
+                //todo 后面要关闭
             }
         }
-        if (empty($info['mainId']) || $info['mainId'] != $this->mainId) {
-            //不能注释，分享付款功能要用，客户没有登录也能付款
-            //util::fail('无法访问');
-        }
+
         $customId = $info['customId'] ?? 0;
         $custom = CustomClass::getById($customId);
         $customName = $custom['name'] ?? '';

biz-ghs/order/classes/ScanPayClass.php

@@ -31,7 +31,7 @@ class ScanPayClass extends BaseClass
         if ($canRefundPrice < 0) {
             $canRefundPrice = 0;
         }
-        $refundList = ScanPayRefundClass::getAllByCondition(['scanPayId' => $id], null, '*', 'id DESC');
+        $refundList = ScanPayRefundClass::getAllByCondition(['scanPayId' => $id], 'id DESC', '*');
         $payWay = $order->payWay ?? 0;
         $payWayMap = dict::getDict('payWay');
         $payWayName = '未知';

biz-hd/order/classes/ScanPayClass.php

@@ -59,7 +59,7 @@ class ScanPayClass extends BaseClass
         if ($canRefundPrice < 0) {
             $canRefundPrice = 0;
         }
-        $refundList = ScanPayRefundClass::getAllByCondition(['scanPayId' => $id], null, '*', 'id DESC');
+        $refundList = ScanPayRefundClass::getAllByCondition(['scanPayId' => $id], 'id DESC', '*');
         $payWay = $order->payWay ?? 0;
         $payWayMap = dict::getDict('payWay');
         $payWayName = '未知';