wupengfei 2 éve
szülő
commit
ba57326764

+ 1 - 4
application/api/controller/Qc.php

@@ -29,10 +29,7 @@ class Qc extends Base {
 
     public function index()
     {
-       $act = ReductionActivity::getAct();
-       $act_set = $act['act_set'];
-        $red = ReductionActivity::getReduction(750,$act_set);
-        var_dump($red);
+       $red = ReductionActivity::getReduction(750);
     }
 
 

+ 7 - 2
application/common/model/ReductionActivity.php

@@ -16,10 +16,14 @@ class ReductionActivity extends Model
     }
 
     // 获取订单金额满减数量
-    public static function getReduction($money,$act_set)
+    public static function getReduction($money,$act_set = [])
     {
         $redu_money = 0;
-        if(empty($act_set)) return $redu_money;
+        if(empty($act_set)){
+            $act = self::getAct();
+            if(!$act_set)  return $redu_money;
+            $act_set = $act['act_set'];
+        }
         array_multisort(array_column($act_set,'full'),SORT_DESC,$act_set);
         foreach ($act_set as $tv)
         {
@@ -30,4 +34,5 @@ class ReductionActivity extends Model
         }
         return $redu_money;
     }
+
 }