diff --git a/Application/Admin/Controller/FinancePromoteController.class.php b/Application/Admin/Controller/FinancePromoteController.class.php index b38e6f4c0..e628d5e59 100644 --- a/Application/Admin/Controller/FinancePromoteController.class.php +++ b/Application/Admin/Controller/FinancePromoteController.class.php @@ -283,6 +283,9 @@ class FinancePromoteController extends AdminController } $map['s.pay_status']=1; $map['s.is_check']=1; + if(IS_SUBSITE){ + $map['s.partner_type']=PARTNER_TYPE; + } $field= "SUM(CASE WHEN pay_way > 0 THEN pay_amount ELSE 0 END) as cash_count, SUM(CASE WHEN pay_way = 0 THEN pay_amount ELSE 0 END) as balance_coin_count, SUM(CASE WHEN pay_way = -1 THEN pay_amount ELSE 0 END) as bind_coin_count, @@ -513,6 +516,9 @@ class FinancePromoteController extends AdminController } $map['s.pay_status']=1; $map['s.is_check']=1; + if(IS_SUBSITE){ + $map['s.partner_type']=PARTNER_TYPE; + } // dd($map); $field= "SUM(CASE WHEN pay_way > 0 THEN pay_amount ELSE 0 END) as cash_count, SUM(CASE WHEN pay_way = 0 THEN pay_amount ELSE 0 END) as balance_coin_count, @@ -602,7 +608,9 @@ class FinancePromoteController extends AdminController $map['promote.admin_id'] = ['gt', 0]; $map['s.market_admin_id'] = ['gt', 0]; } - + if(IS_SUBSITE){ + $map['s.partner_type']=PARTNER_TYPE; + } //获取推广员 $title = ''; self::setPromoteMap($map,"s.promote_id",$title,false); @@ -738,7 +746,9 @@ class FinancePromoteController extends AdminController if ($adminId > 0) { $map['market_admin_id'] = $adminId; } - + if(IS_SUBSITE){ + $map['partner_type']=PARTNER_TYPE; + } /* if (!empty(I('develop_type'))) { $map['company.develop_type'] = I('develop_type'); } diff --git a/jbc.php b/jbc.php index 77a428be7..a9d560325 100644 --- a/jbc.php +++ b/jbc.php @@ -37,6 +37,7 @@ define ( 'RUNTIME_PATH', './Runtime/' ); $JBC_DB_CONFIG = include_once APP_PATH."/Common/Conf/env.php"; $JBC_DB_CONFIG = $JBC_DB_CONFIG['SUBSITE_DB_CONFIG']['JBC_DB_CONFIG']; define ( 'IS_SUBSITE', true); +define ( 'PARTNER_TYPE', 2); define ( 'SUBSITE_NAME', "jbc"); define ( 'SUBSITE_DB', $JBC_DB_CONFIG ); define ( 'SUBSITE_INDEX', "jbc.php" );//子站点路口,影响session