Merge branch 'feature/market_percentage' of wmtx/platform into release

市场专员业绩结算结构修改

Application/Admin/Controller/TimingController.class.php

@@ -773,7 +773,7 @@ class TimingController extends AdminController {
             ->select(false);
 
         $data = M("auth_group_access")
-            ->field("auth.market_percentage,real_name,sys_member.uid")
+            ->field("auth.market_percentage,real_name,sys_member.uid,sys_auth_group_access.group_id")
             ->join("left join ({$data}) auth on auth.id = sys_auth_group_access.group_id")
             ->join("left join sys_member on sys_member.uid = sys_auth_group_access.uid")
             ->where("auth.title is not null")
@@ -782,7 +782,7 @@ class TimingController extends AdminController {
         $spend = M("spend","tab_")
             ->field("sum(pay_amount) as pay_amount,FROM_UNIXTIME(pay_time,'%Y-%m') pay_time,
             substring_index(substring_index(tab_spend.game_name,'(',1),'(',-1) game_name,game_id,relation_game_id,tab_spend.sdk_version,
-            CASE WHEN substring_index(substring_index(`chain`,'/',2),'/',-1) !='' THEN substring_index(substring_index(`chain`,'/',2),'/',-1) ELSE promote_id END promote_id,pay_way")
+            CASE WHEN substring_index(substring_index(`chain`,'/',2),'/',-1) !='' THEN substring_index(substring_index(`chain`,'/',2),'/',-1) ELSE promote_id END promote_id,pay_way,market_admin_id")
             ->join("left join tab_promote on tab_spend.promote_id = tab_promote.id")
             ->join("left join tab_game game on game.id=tab_spend.game_id")
             ->where(['tab_spend.pay_status'=>1,'pay_way'=>['egt',1]])
@@ -793,7 +793,7 @@ class TimingController extends AdminController {
         $payway_spend = M()->table("({$spend}) spend")
             ->field("sum(pay_amount) as pay_amount,pay_time,promote_id,game_name,game_id,relation_game_id,pay_way,sdk_version")
             ->where($map)
-            ->group("pay_time,promote_id,game_name,pay_way")
+            ->group("pay_time,promote_id,game_name,pay_way,market_admin_id")
             ->select();
 
         $channel_fee = [];
@@ -856,19 +856,19 @@ class TimingController extends AdminController {
         }
 
         $spend = M()->table("({$spend}) spend")
-            ->field("sum(pay_amount) as pay_amount,pay_time,promote_id,game_name,game_id,relation_game_id,sdk_version")
+            ->field("sum(pay_amount) as pay_amount,pay_time,promote_id,game_name,game_id,relation_game_id,sdk_version,market_admin_id")
             ->where($map)
-            ->group("pay_time,promote_id,game_name")
+            ->group("pay_time,promote_id,game_name,market_admin_id")
             ->select(false);
 
         $promote_data = M()->table("({$spend}) spend")
-            ->field("pay_time,company_id,account as promote_account,company.company_belong,develop_type,spend.promote_id,spend.game_name,game_id,relation_game_id,spend.pay_amount,auth.real_name,auth.uid as admin_id,market_percentage,sdk_version")
+            ->field("pay_time,company_id,account as promote_account,company.company_belong,develop_type,spend.promote_id,spend.game_name,game_id,relation_game_id,spend.pay_amount,auth.real_name,market_admin_id as admin_id,market_percentage,sdk_version")
             ->join("left join tab_promote promote on spend.promote_id = promote.id")
             ->join("left join tab_promote_company company on promote.company_id = company.id")
-            ->join("left join ({$data}) auth on auth.uid=admin_id")
+            ->join("left join ({$data}) auth on auth.uid=market_admin_id")
-            ->where(['develop_type'=>['egt',1]])
+            ->where(['develop_type'=>['egt',1],'group_id'=>['in',['11','12','21']]])
             ->select();
-//        dump($promote_data);die();
+//        dump($spend);die();
         //
 
 //        dump($tax_radio);die();

Application/Admin/View/PromoteCompany/edit.html

@@ -198,7 +198,7 @@
                             <td class="l">开发类型：</td>
                             <td class="r" >
                                 <select id="develop_type" name="develop_type" class="select_gallery" style="width: 215px;">
-                                    <option value="">请选择开发类型</option>
+                                    <option value="0">请选择开发类型</option>
                                     <option value="1" <if condition="$data.develop_type eq 1">selected</if>>自主开发</option>
                                     <option value="2" <if condition="$data.develop_type eq 2">selected</if>>自主开发及维护</option>
                                     <option value="3" <if condition="$data.develop_type eq 3">selected</if>>只维护</option>