修改分红金额生效顺序

app/controller/api/store/merchant/TaskPartnerProfits.php

@@ -140,14 +140,14 @@ class TaskPartnerProfits
         $redEnvelope = $this->getRedEnvelopeByTime($startTime, $endTime, $removeUserIdList);
 
         $weekRecord = bcsub($performance, $redEnvelope, 2);
+
+        if (!is_null($maxAllocationAmount)) {
+            $weekRecord = $maxAllocationAmount;
+        }
+
         if ($weekRecord <= 0) {
             return json('无效分红金额');
         }
-        if (!is_null($maxAllocationAmount)) {
-            if ($weekRecord > $maxAllocationAmount) {
-                $weekRecord = $maxAllocationAmount;
-            }
-        }
 
 
         // 1、获取用户星级信息

app/controller/api/store/merchant/Taskorderguquan.php

@@ -783,14 +783,14 @@ class Taskorderguquan
         $redEnvelope = $this->getRedEnvelopeByTime($startTime, $endTime, $removeUserIdList);
 
         $weekRecord -= $redEnvelope;
+
+        if (!is_null($maxAllocationAmount)) {
+            $weekRecord = $maxAllocationAmount;
+        }
+
         if ($weekRecord <= 0) {
             return json('无效分红金额');
         }
-        if (!is_null($maxAllocationAmount)) {
-            if ($weekRecord > $maxAllocationAmount) {
-                $weekRecord = $maxAllocationAmount;
-            }
-        }
 
         // $stock_comm = round($weekRecord * 0.05 ,2);
         $stock_comm = floor(($weekRecord * 0.05) * 100) / 100;

app/controller/api/store/merchant/Taskorderlianc.php

@@ -306,14 +306,14 @@ class Taskorderlianc
         $redEnvelope = $this->getRedEnvelopeByTime($startTime, $endTime, $removeUserIdList);
 
         $weekRecord -= $redEnvelope;
+
+        if (!is_null($maxAllocationAmount)) {
+            $weekRecord = $maxAllocationAmount;
+        }
+
         if ($weekRecord <= 0) {
             return json('无效分红金额');
         }
-        if (!is_null($maxAllocationAmount)) {
-            if ($weekRecord > $maxAllocationAmount) {
-                $weekRecord = $maxAllocationAmount;
-            }
-        }
 
         $originator_award = round(($weekRecord * 0.05), 2);