Merge branch 'sh' into dev

biz-ghs/order/classes/ShMethodClass.php

@@ -237,16 +237,13 @@ class ShMethodClass extends BaseClass
         $minAmount = isset($config['minAmount']) ? (float)$config['minAmount'] : 0.00;
         $minNum = isset($config['minNum']) ? (int)$config['minNum'] : 0;
         
-        // 只要满足任意一个条件，就不算“未达标”
-        $isBelowMinimum = true;
-        if ($minAmount > 0 && $actPrice >= $minAmount) {
-            $isBelowMinimum = false;
+        // 必须金额和数量同时满足（如果设置了的话），才算“达标”
+        $isBelowMinimum = false;
+        if ($minAmount > 0 && $actPrice < $minAmount) {
+            $isBelowMinimum = true;
         }
-        if ($minNum > 0 && (float)$bigNum >= $minNum) {
-            $isBelowMinimum = false;
-        }
-        if ($minAmount <= 0 && $minNum <= 0) {
-            $isBelowMinimum = false;
+        if ($minNum > 0 && (float)$bigNum < $minNum) {
+            $isBelowMinimum = true;
         }
 
         if (!$isBelowMinimum) {
@@ -363,16 +360,13 @@ class ShMethodClass extends BaseClass
         $minAmount = isset($config['minAmount']) ? (float)$config['minAmount'] : 0.00;
         $minNum = isset($config['minNum']) ? (int)$config['minNum'] : 0;
         
-        // 只要满足任意一个条件，就不算“未达标”
-        $isBelowMinimum = true;
-        if ($minAmount > 0 && $itemTotalAmount >= $minAmount) {
-            $isBelowMinimum = false;
-        }
-        if ($minNum > 0 && (float)$bigNum >= $minNum) {
-            $isBelowMinimum = false;
+        // 必须金额和数量同时满足（如果设置了的话），才算“达标”
+        $isBelowMinimum = false;
+        if ($minAmount > 0 && $itemTotalAmount < $minAmount) {
+            $isBelowMinimum = true;
         }
-        if ($minAmount <= 0 && $minNum <= 0) {
-            $isBelowMinimum = false;
+        if ($minNum > 0 && (float)$bigNum < $minNum) {
+            $isBelowMinimum = true;
         }
 
         // 如果已经达标，不收取附加费用