修改

Controller/Cron/NewCommissionCron.Class.php

@@ -42,7 +42,7 @@ class NewCommissionCron
             
             //门店代理任务
             $taskTotal2 = new AgentTools($value['id']);
-            $res2 = $taskTotal2->runTask();
+            $res2 = $taskTotal2->runTaskNew();
             if(empty($res2) || empty($res2["code"])){
                 echo '系统错误'.PHP_EOL;
             }else{

Model/Purchase/MPurchase.Class.php

@@ -373,7 +373,7 @@ class MPurchase extends MBaseModel
         $returnData = $dbResult;
         unset($dbResult);
         if($updateData['inStatus']==5){
-            AgentTools::addTask($where['id'], $this->onlineEnterpriseId);
+            AgentTools::addTaskNew($where['id'], $this->onlineEnterpriseId);
         }
         
         return ResultWrapper::success($returnData);

Util/Common/AgentTools.Class.php

@@ -1380,6 +1380,13 @@ class AgentTools{
                 "incomePer"=>0,
                 "is_open"=>0,
                 "bankData"=>"",
+                "oneToTwoNum"=>0,
+                "twoToThreeNum"=>0,
+                "oneonePer"=>0,
+                "oneTwoPer"=>0,
+                "twoOnePer"=>0,
+                "twoTwoPer"=>0,
+                "threePer"=>0,
             ];
         }
         return $data;
@@ -1403,14 +1410,27 @@ class AgentTools{
         $parms["levPer"]    = empty($parms["levPer"])   ? 0 : $parms["levPer"];
         $parms["incomePer"] = empty($parms["incomePer"])? 0 : $parms["incomePer"];
         $parms["is_open"]   = empty($parms["is_open"])  ? 0 : 1;
+        
+        
+        
 //        if(!is_numeric($parms["levMoney"]) || $parms["levMoney"]<=0){
 //            return ["code"=>"-1","msg"=>"升级门店代理金额必须大于0"];
 //        }
 //        if(!is_numeric($parms["levPer"]) || $parms["levPer"]<0 || $parms["levPer"]>=1){
 //            return ["code"=>"-1","msg"=>"子级升级门店代理消费佣金比例必须0到1之间"];
 //        }
-        if(!is_numeric($parms["incomePer"]) || $parms["incomePer"]<0 || $parms["incomePer"]>=1){
-            return ["code"=>"-1","msg"=>"门店采购佣金比例必须0到1之间"];
+        
+        if(!is_numeric($parms["oneonePer"]) || $parms["oneonePer"]<0 || $parms["oneonePer"]>=1){
+            return ["code"=>"-1","msg"=>"佣金比例必须0到1之间"];
+        }
+        if(!is_numeric($parms["oneTwoPer"]) || $parms["oneTwoPer"]<0 || $parms["oneTwoPer"]>=1){
+            return ["code"=>"-1","msg"=>"佣金比例必须0到1之间"];
+        }
+        if(!is_numeric($parms["twoOnePer"]) || $parms["twoOnePer"]<0 || $parms["twoOnePer"]>=1){
+            return ["code"=>"-1","msg"=>"佣金比例必须0到1之间"];
+        }
+        if(!is_numeric($parms["threePer"]) || $parms["threePer"]<0 || $parms["threePer"]>=1){
+            return ["code"=>"-1","msg"=>"佣金比例必须0到1之间"];
         }
         $saveData = [
             "enterpriseId" => $enterpriseId,
@@ -1418,6 +1438,13 @@ class AgentTools{
             "levPer"       => $parms["levPer"],
             "incomePer"    => $parms["incomePer"],
             "is_open"      => $parms["is_open"],
+            "oneToTwoNum"  => $parms["oneToTwoNum"]?:0,
+            "twoToThreeNum"=> $parms["twoToThreeNum"]?:0,
+            "oneonePer"    => $parms["oneonePer"]?:0,
+            "oneTwoPer"    => $parms["oneTwoPer"]?:0,
+            "twoOnePer"    => $parms["twoOnePer"]?:0,
+            "twoTwoPer"    => $parms["twoTwoPer"]?:0,
+            "threePer"     => $parms["threePer"]?:0,
             "updateTime"   => time()
         ];
         $res = false;