满减与折扣不仅客户下单可以享受，花店开单也行（统统不做限制）

biz-hd/order/classes/OrderClass.php

@@ -274,33 +274,30 @@ class OrderClass extends BaseClass
         }
         $data['reachTime'] = strtotime($data['reachDate'] . ' ' . $data['reachPeriod']);
 
-        // 客户自己下单才有整单满减
-        if (isset($data['fromType']) && $data['fromType'] == dict::getDict('fromType', 'mall')) {
-            $book = $data['book'] ?? 0;
-            if ($book == 0) {
-                $actPrice = $data['actPrice'];
-                $meetNum = $shop->meetNum ?? 0;
-                $meetAmount = $shop->meetAmount ?? 0;
-                $cutOption = $shop->cutAmount ?? 0;
-                $cutStyle = $shop->cutStyle ?? 0;
-
-                if ($cutStyle == 0) {
-                    $cutAmount = $cutOption;
-                } else {
-                    $miniOption = bcsub(1, $cutOption, 2);
-                    $cutAmount = bcmul($actPrice, $miniOption, 2);
-                }
-                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);
-                            $data['orderReachDiscountPrice'] = $cutAmount;
-                            $data['actPrice'] = $actPrice;
-                            $data['realPrice'] = $actPrice;
-                            $data['mainPay'] = $actPrice;
-                        } else {
-                            noticeUtil::push('订单金额不足满减金额，customId:' . $data['customId'], '15280215347');
-                        }
+        $book = $data['book'] ?? 0;
+        if ($book == 0) {
+            $actPrice = $data['actPrice'];
+            $meetNum = $shop->meetNum ?? 0;
+            $meetAmount = $shop->meetAmount ?? 0;
+            $cutOption = $shop->cutAmount ?? 0;
+            $cutStyle = $shop->cutStyle ?? 0;
+
+            if ($cutStyle == 0) {
+                $cutAmount = $cutOption;
+            } else {
+                $miniOption = bcsub(1, $cutOption, 2);
+                $cutAmount = bcmul($actPrice, $miniOption, 2);
+            }
+            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);
+                        $data['orderReachDiscountPrice'] = $cutAmount;
+                        $data['actPrice'] = $actPrice;
+                        $data['realPrice'] = $actPrice;
+                        $data['mainPay'] = $actPrice;
+                    } else {
+                        noticeUtil::push('订单金额不足满减金额，customId:' . $data['customId'], '15280215347');
                     }
                 }
             }