バグ #937
成果手動反映スクリプト改修
ステータス: | 商用リリース | 開始日: | 2016/11/25 | |
---|---|---|---|---|
優先度: | 通常 | 期日: | ||
担当者: | 山本 義治 | 進捗 %: | 0% | |
カテゴリ: | 成果通知 | 作業時間の記録: | - | |
対象バージョン: | - |
説明
クリックログが保留ステータスの時
ERROR: aff_id is invalid NG
にならないようにする
履歴
#1 山本 義治 が約8年前に更新
[root@web1 ~]# cd /www/aff_test_new/ad/www/ac/ [root@web1 ac]# git branch -a * develop feature/#750_modify_asp_cid_feature master remotes/origin/develop remotes/origin/feature/#738_add_csv_field remotes/origin/feature/#750_modify_asp_cid_feature remotes/origin/feature/#754_hide_referer_on_user_report remotes/origin/feature/#937_fix_action_manual_feature remotes/origin/master [root@web1 ac]# git fetch --all [root@web1 ac]# git diff HEAD FETCH_HEAD diff --git a/ad/www/ac/action_manual.php b/ad/www/ac/action_manual.php index 35d9570..89c6fe6 100644 --- a/ad/www/ac/action_manual.php +++ b/ad/www/ac/action_manual.php @@ -176,11 +176,11 @@ if(!count($err)){ } if($sp == "i") - $click_log_query = "where status != 5 and ip = '$ip' order by click_date desc limit 1"; + $click_log_query = "where ip = '$ip' order by click_date desc limit 1"; else if($sub_auth_flg) - $click_log_query = "where status != 5 and subscriber = '$sub_id' order by click_date desc limit 1"; + $click_log_query = "where subscriber = '$sub_id' order by click_date desc limit 1"; else - $click_log_query = "where status != 5 and aff_id = '$afid' limit 1"; + $click_log_query = "where aff_id = '$afid' limit 1"; //2009/12/8 <83>N<83><8A><83>b<83>N<8C>o<89>゚後無<8A><FA><8C><C0> //for($stat_month=date("Ym");$stat_month>=$START_MONTH;$stat_month=date("Ym",mktime(0,0,0,substr($stat_month,4,2)-1,1,substr($stat_month,0,4)))){ @@ -251,10 +251,10 @@ if(!count($err)){ if(!count($err)){ //<83>N<83><8A><83>b<83>N<83><8D><83>O<82>フス<83>e<81>[<83>^<83>X<82><F0><95>ロ〓<AF><8F><F3><91>ヤに〓<B7><82><E9>(<98>A<91><B1><93>o<98>^<96>h<8E>‾<8D><F4><81>j - if($click_log_id){ - $tsql = "update click_log_".$stat_month." set status = '5' where aff_id = '$aff_id'"; - $tres = __mysql_query_ex($tsql); - } + // if($click_log_id){ + // $tsql = "update click_log_".$stat_month." set status = '5' where aff_id = '$aff_id'"; + // $tres = __mysql_query_ex($tsql); + // } if(!$program_id) $program_id = 1; [root@web1 ac]# git merge FETCH_HEAD Updating 38ce2af..7ca7272 Fast-forward ad/www/ac/action_manual.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) [root@web1 ac]# git diff HEAD FETCH_HEAD [root@web1 ac]# git log commit 7ca72728381ed37a8374c8a9da9a43463949b254 Author: Yoshiharu Yamamoto <haltyt@gmail.com> Date: Fri Nov 25 11:27:32 2016 +0900 クリックステータス保留時にも反映されるように修正 ... [root@web1 ac]# diff action_manual.php /www/aff/ad/www/ac/ 179c179 < $click_log_query = "where ip = '$ip' order by click_date desc limit 1"; --- > $click_log_query = "where status != 5 and ip = '$ip' order by click_date desc limit 1"; 181c181 < $click_log_query = "where subscriber = '$sub_id' order by click_date desc limit 1"; --- > $click_log_query = "where status != 5 and subscriber = '$sub_id' order by click_date desc limit 1"; 183c183 < $click_log_query = "where aff_id = '$afid' limit 1"; --- > $click_log_query = "where status != 5 and aff_id = '$afid' limit 1"; 254,257c254,257 < // if($click_log_id){ < // $tsql = "update click_log_".$stat_month." set status = '5' where aff_id = '$aff_id'"; < // $tres = __mysql_query_ex($tsql); < // } --- > if($click_log_id){ > $tsql = "update click_log_".$stat_month." set status = '5' where aff_id = '$aff_id'"; > $tres = __mysql_query_ex($tsql); > } [root@web1 ac]# cp -p action_manual.php /www/aff/ad/www/ac/ cp: `/www/aff/ad/www/ac/action_manual.php' を上書きしてもよろしいですか(yes/no)? y