Merge branch 'master' into dev-sxb

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

@@ -17,59 +17,53 @@ class Taskorderguquan
     public function assignment()
     {
         /**
-        1.1万元补贴下面人员
+        8000元补贴下面人员
         13231658486周行体1000
         13333069689魏惠新1000
-        13959100621周金花600
-        13701061395李素红500
-        17501006833邢艳丽600
-        15631982690魏震洪600
-        18603401312黄金花500
-        13521438652徐立苹500
-        15832971815孟晓玮600
-        18600200909陈冠霖600
-        18001316701闫旭600
-        13811180929周京晨800
-        15810064711 王   玲 500
-        15321221558李伟600
+        13959100621周金花500
+        13701061395李素红300
+        17501006833邢艳丽300
+        15631982690魏震洪400
+        18603401312黄金花400
+        13521438652徐立苹300
+        15832971815孟晓玮500
+        18600200909陈冠霖500
+        18001316701闫旭400
+        13811180929周京晨500
+        15810064711 王玲 300
+        15321221558李伟300
         15373282785天一500
-        15232797965侯玉兰300
-        13601071082隋彩云300
-        13161909228刘银霞100
-        13701059062王金权100
+        15232797965侯玉兰50
+        13601071082隋彩云100
+        13161909228刘银霞50
         18760167163刘春梅50
-        13716400006郝金茹50
-        13895677473李素敏50
         13215917919李小秋50
         18715313601大饼500
 
-        共计11000元
+        共计8000元
 
         5.7万做股权，联创，合伙人分红
          */
         $data = [
             '13231658486' => 1000,
             '13333069689' => 1000,
-            '13959100621' => 600,
-            '13701061395' => 500,
-            '17501006833' => 600,
-            '15631982690' => 600,
-            '18603401312' => 500,
-            '13521438652' => 500,
-            '15832971815' => 600,
-            '18600200909' => 600,
-            '18001316701' => 600,
-            '13811180929' => 800,
-            '15810064711' => 500,
-            '15321221558' => 600,
+            '13959100621' => 500,
+            '13701061395' => 300,
+            '17501006833' => 300,
+            '15631982690' => 400,
+            '18603401312' => 400,
+            '13521438652' => 300,
+            '15832971815' => 500,
+            '18600200909' => 500,
+            '18001316701' => 400,
+            '13811180929' => 500,
+            '15810064711' => 300,
+            '15321221558' => 300,
             '15373282785' => 500,
-            '15232797965' => 300,
-            '13601071082' => 300,
-            '13161909228' => 100,
-            '13701059062' => 100,
+            '15232797965' => 50,
+            '13601071082' => 100,
+            '13161909228' => 50,
             '18760167163' => 50,
-            '13716400006' => 50,
-            '13895677473' => 50,
             '13215917919' => 50,
             '18715313601' => 500,
         ];
@@ -783,14 +777,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);