shish 6 ماه پیش
والد
کامیت
e8f3ee793c
1فایلهای تغییر یافته به همراه5 افزوده شده و 12 حذف شده
  1. 5 12
      biz-hd/purchase/classes/PurchaseClass.php

+ 5 - 12
biz-hd/purchase/classes/PurchaseClass.php

@@ -989,20 +989,13 @@ class PurchaseClass extends BaseClass
                         $miniOption = bcsub(1, $cutOption, 2);
                         $cutAmount = bcmul($actPrice, $miniOption, 2);
                     }
-                    if ($cutOption > 0) {
-                        if ($meetNum > 0 && $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 ($bigNum >= $meetNum && $data['itemPrice'] >= $meetAmount) {
+                            if ($cutAmount < $actPrice) {
                                 $actPrice = bcsub($actPrice, $cutAmount, 2);
                                 $data['orderReachDiscountPrice'] = $cutAmount;
+                            } else {
+                                noticeUtil::push('订单金额不足满减金额,ghsShopId:' . $ghsShopId, '15280215347');
                             }
                         }
                     }