满减金额

biz-ghs/order/classes/OrderClass.php

@@ -5,6 +5,7 @@ namespace bizGhs\order\classes;
 use bizGhs\item\classes\ItemClassClass;
 use bizHd\purchase\classes\PurchaseItemClass;
 use common\components\arrayUtil;
+use common\components\noticeUtil;
 use wkhtmltox\Image\Converter;
 use biz\shop\classes\ShopCapitalClass;
 use biz\shop\classes\ShopClass;
@@ -927,20 +928,13 @@ class OrderClass extends BaseClass
                     $miniOption = bcsub(1, $cutOption, 2);
                     $cutAmount = bcmul($actPrice, $miniOption, 2);
                 }
-                if ($cutOption > 0) {
-                    if ($meetNum > 0 && isset($data['bigNum']) && $data['bigNum'] >= $meetNum) {
-                        if ($cutAmount > $actPrice) {
-                            util::fail('整单满减为负');
-                        }
-                        $actPrice = bcsub($actPrice, $cutAmount, 2);
-                        $data['orderReachDiscountPrice'] = $cutAmount;
-                    } else {
-                        if ($meetAmount > 0 && isset($data['itemPrice']) && $data['itemPrice'] >= $meetAmount) {
-                            if ($cutAmount > $actPrice) {
-                                util::fail('整单满减为负');
-                            }
+                if ($cutAmount > 0 && $meetNum > 0 && $meetAmount > 0) {
+                    if (isset($data['bigNum']) && $data['bigNum'] >= $meetNum && isset($data['itemPrice']) && $data['itemPrice'] >= $meetAmount) {
+                        if ($cutAmount < $actPrice) {
                             $actPrice = bcsub($actPrice, $cutAmount, 2);
                             $data['orderReachDiscountPrice'] = $cutAmount;
+                        } else {
+                            noticeUtil::push('订单金额不足满减金额，customId:' . $customId, '15280215347');
                         }
                     }
                 }