yingzi 1 年之前
父節點
當前提交
943550a951
共有 2 個文件被更改,包括 5 次插入10 次删除
  1. 1 1
      Dao/CommissionPartner/DNewAgentSetting.Class.php
  2. 4 9
      Util/Common/AgentTools.Class.php

+ 1 - 1
Dao/CommissionPartner/DNewAgentSetting.Class.php

@@ -26,7 +26,7 @@ class DNewAgentSetting extends BaseDao
             "time",
             "oneToTwoNum",
             "twoToThreeNum",
-            "oneonePer",
+            "oneOnePer",
             "oneTwoPer",
             "twoOnePer",
             "twoTwoPer",

+ 4 - 9
Util/Common/AgentTools.Class.php

@@ -202,7 +202,7 @@ class AgentTools{
             //获取配置
             $dbSetting = new DNewAgentSetting('default');
             $settingData = $dbSetting->get(["enterpriseId"=>$enterpriseId]);
-            if(empty($settingData) || empty($settingData["is_open"]) || $settingData["oneonePer"]<=0){
+            if(empty($settingData) || empty($settingData["is_open"]) || $settingData["oneOnePer"]<=0){
                 return ["code"=>-1,"msg"=>"还未进行分佣配置"];
             }
             //获取采购单信息
@@ -684,16 +684,12 @@ class AgentTools{
         $nowTime = time();
         $levelAr = ["xxxx","one","two"];
         //先计算父级门店
-        var_dump($shopData);
         $twoShopData = $this->dbShop->get(["id"=>$shopData["pTwoShopId"],"enterpriseId"=>$this->enterpriseId,"deleteStatus"=>5]);
-        var_dump($twoShopData);
         if(!empty($twoShopData) && !empty($twoShopData["agentId"])){
             $twoAgentData = $this->dbNewAgent->get(["id"=>$twoShopData["agentId"]]);
             if(!empty($twoAgentData)){
                 //董事
                 $twoPer=0;
-                var_dump($twoShopData["level"]);
-                var_dump($this->agentSettingData);
                 if($twoShopData["level"]==3){
                     $twoPer = empty($this->agentSettingData["threePer"])?0:$this->agentSettingData["threePer"];
                 }else{
@@ -703,7 +699,6 @@ class AgentTools{
                         $twoPer = empty($this->agentSettingData[$twoPerKey]) ? 0 : $this->agentSettingData[$twoPerKey];
                     }
                 }
-                var_dump($twoPer);
                 if(!empty($twoPer) && $twoPer>0 && $twoPer<1){
                     //记录收益
                     $data[]=[
@@ -1388,7 +1383,7 @@ class AgentTools{
                 "bankData"=>"",
                 "oneToTwoNum"=>0,
                 "twoToThreeNum"=>0,
-                "oneonePer"=>0,
+                "oneOnePer"=>0,
                 "oneTwoPer"=>0,
                 "twoOnePer"=>0,
                 "twoTwoPer"=>0,
@@ -1426,7 +1421,7 @@ class AgentTools{
 //            return ["code"=>"-1","msg"=>"子级升级门店代理消费佣金比例必须0到1之间"];
 //        }
         
-        if(!is_numeric($parms["oneonePer"]) || $parms["oneonePer"]<0 || $parms["oneonePer"]>=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){
@@ -1446,7 +1441,7 @@ class AgentTools{
             "is_open"      => $parms["is_open"],
             "oneToTwoNum"  => $parms["oneToTwoNum"]?:0,
             "twoToThreeNum"=> $parms["twoToThreeNum"]?:0,
-            "oneonePer"    => $parms["oneonePer"]?:0,
+            "oneOnePer"    => $parms["oneOnePer"]?:0,
             "oneTwoPer"    => $parms["oneTwoPer"]?:0,
             "twoOnePer"    => $parms["twoOnePer"]?:0,
             "twoTwoPer"    => $parms["twoTwoPer"]?:0,