Merge branch 'master' into dev

app/command/PensionTasks.php

@@ -53,7 +53,7 @@ class PensionTasks extends Command
 //            $this->doOnlineOrderGzc($timeLimit = 30);
 //            $this->doOnlineHuuafeiOrderGzc($timeLimit = 30);
             $this->onlineOrderNew($timeLimit = 30);
-            $this->huafeiOrderNew($timeLimit = 30);
+            $this->huafeiOrderNew($timeLimit = 0);
             $this->pddOrderNew($timeLimit = 30);
             $this->jdOrderNew($timeLimit = 30);
             $this->suOrderNew($timeLimit = 30);

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

@@ -18,52 +18,63 @@ class Taskorderguquan
     {
 
         /**
-        * 补贴下面人员
-         * 13231658486周行体300
-         * 13333069689魏   新300
-         * 13959100621周金花200
-         * 13701061395李素红200
+         * 业绩7800分配
+         * 补贴下面人员
+         * 13231658486周行体200
+         * 13333069689魏   新200
+         * 13959100621周金花100
+         * 13701061395李素红100
          * 17501006833邢艳丽100
          * 15631982690魏震洪100
          * 18603401312黄金花50
-         * 13521438652徐立苹200
+         * 13521438652徐立苹100
          * 15832971815孟晓玮100
          * 15810064711 王   玲 100
-         * 13932925303会强100
+         * 13932925303会强50
          * 13601071082隋彩云100
          * 13601179856陈瑞元50
          * 13161909228刘银霞100
+         * 13901074090陈玉刚50
          * 18760167163刘春梅20
          * 13215917919李小秋20
          * 15532683963李玉芝50
-         * 13381085923王建军50
-         * 13231658486周军市场补贴400
-         * 13331043787张吉良65
-         * 15332507711 张传莲 50
+         * 13381085923王建军20
+         * 15332507711张传莲20
+         * 18959022728吴碧红20
+         * 1593402751马贵中20
+         * 15232797965侯玉兰20
+         * 13231658486
+         * 13231658486周军市场补贴200
+         * 13331043787张吉良55
          * 18715313601大饼100
+         * 其余部分做分红
          */
         $data = [
-            '13231658486' => 700,
-            '13333069689' => 300,
-            '13959100621' => 200,
-            '13701061395' => 200,
+            '13231658486' => 400,
+            '13333069689' => 200,
+            '13959100621' => 100,
+            '13701061395' => 100,
             '17501006833' => 100,
             '15631982690' => 100,
             '18603401312' => 50,
-            '13521438652' => 200,
+            '13521438652' => 100,
             '15832971815' => 100,
             '15810064711' => 100,
-            '13932925303' => 100,
+            '13932925303' => 50,
             '13601071082' => 100,
             '13601179856' => 50,
             '13161909228' => 100,
+            '13901074090' => 50,
             '18760167163' => 20,
             '13215917919' => 20,
             '15532683963' => 50,
-            '13381085923' => 50,
-            '13331043787' => 65,
-            '15332507711' => 50,
-            '18715313601' => 100
+            '13381085923' => 20,
+            '15332507711' => 20,
+            '18959022728' => 20,
+            '1593402751'  => 20,
+            '15232797965' => 20,
+            '13331043787' => 55,
+            '18715313601' => 100,
         ];
 
         $result = Db::name("user")