满减

biz-ghs/order/classes/OrderClass.php

@@ -549,24 +549,20 @@ class OrderClass extends BaseClass
                 $meetAmount = $shop->meetAmount ?? 0;
                 $cutAmount = $shop->cutAmount ?? 0;
                 if ($cutAmount > 0) {
-                    if ($meetNum > 0) {
-                        if (isset($data['bigNum']) && $data['bigNum'] >= $meetNum) {
+                    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('整单满减为负');
                             }
                             $actPrice = bcsub($actPrice, $cutAmount, 2);
                             $data['orderReachDiscountPrice'] = $cutAmount;
                         }
-                    } else {
-                        if ($meetAmount > 0) {
-                            if (isset($data['itemPrice']) && $data['itemPrice'] >= $meetAmount) {
-                                if ($cutAmount > $actPrice) {
-                                    util::fail('整单满减为负');
-                                }
-                                $actPrice = bcsub($actPrice, $cutAmount, 2);
-                                $data['orderReachDiscountPrice'] = $cutAmount;
-                            }
-                        }
                     }
                 }
             }

biz-hd/purchase/classes/PurchaseClass.php

@@ -842,24 +842,20 @@ class PurchaseClass extends BaseClass
                     $meetAmount = $ghsShop->meetAmount ?? 0;
                     $cutAmount = $ghsShop->cutAmount ?? 0;
                     if ($cutAmount > 0) {
-                        if ($meetNum > 0) {
-                            if ($bigNum >= $meetNum) {
+                        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('整单满减为负');
                                 }
                                 $actPrice = bcsub($actPrice, $cutAmount, 2);
                                 $data['orderReachDiscountPrice'] = $cutAmount;
                             }
-                        } else {
-                            if ($meetAmount > 0) {
-                                if (isset($data['itemPrice']) && $data['itemPrice'] >= $meetAmount) {
-                                    if ($cutAmount > $actPrice) {
-                                        util::fail('整单满减为负');
-                                    }
-                                    $actPrice = bcsub($actPrice, $cutAmount, 2);
-                                    $data['orderReachDiscountPrice'] = $cutAmount;
-                                }
-                            }
                         }
                     }
                 }