Merge branch 'zhongqi-discount' into dev

biz-hd/order/classes/OrderClass.php

@@ -289,7 +289,7 @@ class OrderClass extends BaseClass
                     $miniOption = bcsub(1, $cutOption, 2);
                     $cutAmount = bcmul($actPrice, $miniOption, 2);
                 }
-                if ($cutAmount > 0 && $meetNum > 0 && $meetAmount > 0) {
+                if ($cutAmount > 0 && $meetNum >= 0 && $meetAmount > 0) {
                     if (isset($data['bigNum']) && $data['bigNum'] >= $meetNum && $data['actPrice'] >= $meetAmount) {
                         if ($cutAmount < $actPrice) {
                             $actPrice = bcsub($actPrice, $cutAmount, 2);