市场结算生成下游代码修改

Application/Admin/Controller/QueryController.class.php

@@ -1477,7 +1477,7 @@ class QueryController extends ThinkController
         $spendMap['tab_spend.pay_status'] = 1;
         //获取spend表中的数据，同时根据会长id进行group分类
         $data = M('Spend','tab_')
-            ->field("FROM_UNIXTIME(pay_time,'%Y-%m') as my_time,sum(pay_amount) as pay_amount,game_id,tab_spend.game_name,SUBSTRING_INDEX(tab_spend.`game_name`,\"(\",1) as game_names,promote_id,promote_account,company_relation,company_belong,CASE WHEN SUBSTRING_INDEX(SUBSTRING_INDEX(`chain`,\"/\",2),\"/\",-1)='' THEN promote_id ELSE SUBSTRING_INDEX(SUBSTRING_INDEX(`chain`,\"/\",2),\"/\",-1) END as root_id,tab_game.ratio ")
+            ->field("FROM_UNIXTIME(pay_time,'%Y-%m') as my_time,sum(pay_amount) as pay_amount,game_id,tab_spend.game_name,SUBSTRING_INDEX(tab_spend.`game_name`,\"(\",1) as game_names,promote_id,promote_account,company_relation,company_belong,CASE WHEN SUBSTRING_INDEX(SUBSTRING_INDEX(`chain`,\"/\",2),\"/\",-1)='' THEN promote_id ELSE SUBSTRING_INDEX(SUBSTRING_INDEX(`chain`,\"/\",2),\"/\",-1) END as root_id,tab_game.ratio,tab_game.relation_game_id ")
             ->join("left join tab_promote on promote_id = tab_promote.id")
             ->join("left join tab_game on tab_game.id=tab_spend.game_id")
             ->where($spendMap)
@@ -1498,7 +1498,7 @@ class QueryController extends ThinkController
         $data = M()->table('('.$data.') as a')
             ->field("my_time,pay_amount,a.game_id,game_name,game_names,a.promote_id,a.promote_account,a.company_relation,a.company_belong,CASE WHEN root_id is null THEN 0 ELSE root_id END as root_id,CASE WHEN account is null THEN '官方渠道' ELSE account END as account,tab_ratio.ratio as ratio,turnover_ratio,a.ratio as game_ratio")
             ->join("left join tab_promote on root_id = tab_promote.id")
-            ->join("left join tab_promote_game_ratio as tab_ratio on tab_ratio.game_id = a.game_id and tab_ratio.promote_id=root_id")
+            ->join("left join tab_promote_game_ratio as tab_ratio on tab_ratio.game_id = a.relation_game_id and tab_ratio.promote_id=root_id")
 //            ->join("left join tab_cp_game_ratio as game_ratio on game_ratio.game_id = a.game_id")
             ->page($page,$row)
             ->where($map)
@@ -1522,8 +1522,10 @@ class QueryController extends ThinkController
 
             if ($value['ratio']) {
                 $data[$key]['downstream'] = $value['pay_amount'] * ($value['ratio']*0.01);
+                var_dump($value['ratio']);
             } else {
                 $data[$key]['downstream'] = $value['pay_amount'] * ($value['game_ratio']*0.01);
+                var_dump($value['ratio']);
             }
 
             $value['turnover_ratio'] = json_decode($value['turnover_ratio'],true);