Merge branch 'master' into dev

app-hd/controllers/PurchaseController.php

@@ -319,7 +319,7 @@ class PurchaseController extends BaseController
         $ghsShopId = $ghsInfo['shopId'] ?? 0;
 
         if (!empty($ghsInfo['mainId']) && $ghsInfo['mainId'] == $ghsInfo['ownMainId']) {
-            util::fail('不能跟自己的店买花');
+            //util::fail('不能跟自己的店买花');
         }
 
         $connection = Yii::$app->db;

biz-hd/purchase/classes/PurchaseClass.php

@@ -999,9 +999,6 @@ class PurchaseClass extends BaseClass
         $prePrice = 0;
         $live = $ghs['live'] ?? 1;
         $sendTimeWant = !empty($data['sendTimeWant']) ? $data['sendTimeWant'] : date("Y-m-d");
-        if ($sendTimeWant < date("Y-m-d")) {
-            util::fail('您选了过去时间');
-        }
         $data['sendTimeWant'] = $sendTimeWant;
         if (empty($data['product'])) {
             util::fail('请选择花材17');