预订单不支持这个发货方式

app-ghs/controllers/OrderController.php

@@ -87,6 +87,11 @@ class OrderController extends BaseController
             'fhWl' => $fhWl,
             'fhWlNo' => $fhWlNo,
         ];
+
+        if ($order->book == 1) {
+            util::fail('预订单不支持这个发货方式');
+        }
+
         $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
@@ -850,7 +855,7 @@ class OrderController extends BaseController
                 //帮开预订单没有价格
                 $productList[$currentKey]['price'] = 0.06;
             }
-            $post['hasPay'] = 1;
+            $post['hasPay'] = 2;
             $post['payWay'] = 0;
         }
 

biz-ghs/order/classes/OrderClass.php

@@ -205,7 +205,7 @@ class OrderClass extends BaseClass
                 util::fail('花材金额需要大于0');
             }
             if ($num > $xhPreNum) {
-                util::fail($name . "数量不能超过{$xhPreNum}{$xhUnitName}");
+                //util::fail($name . "数量不能超过{$xhPreNum}{$xhUnitName}");
             }
             $val->cost = $unitPrice;
             $val->unitPrice = $unitPrice;
@@ -1263,7 +1263,7 @@ class OrderClass extends BaseClass
             }
         }
 
-        if (isset($orderInfo['actPrice']) && $orderInfo['actPrice'] == 0) {
+        if (isset($orderInfo['actPrice']) && $orderInfo['actPrice'] == 0 && $orderInfo['book'] == 0) {
             util::fail('已全额退款，不能打小票');
         }