Merge branch 'master' into dev

app-ghs/controllers/MerchantController.php

@@ -53,10 +53,6 @@ class MerchantController extends BaseController
         $merchant['hsFreeKm'] = $intraCityRet['hsFreeKm'];
         $merchant['hsAddFee'] = $intraCityRet['hsAddFee'];
 
-        $shop = $this->shop;
-        $pfLevel = $shop->pfLevel ?? 0;
-        $merchant['pfLevel'] = $pfLevel;
-
         util::success($merchant);
     }
 

app-ghs/controllers/OrderController.php

@@ -1342,7 +1342,7 @@ class OrderController extends BaseController
 
         CustomClass::valid($custom, $this->shopId);
         if (!empty($custom['mainId']) && $custom['mainId'] == $custom['ownMainId']) {
-            util::fail('不能给自己开单');
+            //util::fail('不能给自己开单');
         }
         $post['ghsId'] = $custom['ghsId'] ?? 0;
         $post['customMobile'] = $custom['mobile'] ?? '';
@@ -3527,7 +3527,7 @@ class OrderController extends BaseController
             }
 
             if (isset($customRes->mainId) && !empty($customRes->mainId) && $customRes->mainId == $customRes->ownMainId) {
-                util::fail('不能给自己开单');
+                //util::fail('不能给自己开单');
             }
 
             $file = $_FILES['file'];

biz-hd/order/classes/OrderClass.php

@@ -434,11 +434,8 @@ class OrderClass extends BaseClass
         $order->status = self::ORDER_STATUS_UN_SEND; // 付款后，订单状态设置为：已付款(待配送)
         $order->payWay = $payWay;
         $order->payStatus = 1;
-        if (!empty($params['historyDate'])) {
-            $order->payTime = $params['historyDate'] . ' ' . date("H:i:s");
-        } else {
-            $order->payTime = date("Y-m-d H:i:s");
-        }
+        $order->sendTime = date("Y-m-d H:i:s");
+        $order->payTime = date("Y-m-d H:i:s");
         $order->stockChange = 1;
         $order->save();