123123

common/dbproxy/tg_main.lua

@@ -64,7 +64,7 @@ end
 
 function M.search(msg_body)
 
-    local isok ,key =  tools.checkData({"is_group_record","tf_time_interval","mini_program_platform_id","is_comment","material_rule_id","parent_main_id","tg_day","id","ads_operation_status","statistics_platform_id","converted_time_duration","cbo_status","project_type","oce_product_id",
+    local isok ,key =  tools.checkData({"title_pay_type","is_boost","is_reservation","title_type_id","is_group_record","tf_time_interval","mini_program_platform_id","is_comment","material_rule_id","parent_main_id","tg_day","id","ads_operation_status","statistics_platform_id","converted_time_duration","cbo_status","project_type","oce_product_id",
     "oce_product_platform_id",
     "delivery_mode","material_platform_id","wx_miniapp_create_status","template_bid","cpa_bid","page_size","page_number","main_name","running_status","custom_budget","pay_type","tg_platform_id","butler_id","tg_app_index","is_open_create_link","is_delete"},msg_body)
    
@@ -78,6 +78,26 @@ function M.search(msg_body)
 
     local offset = (page_number - 1) * page_size
 
+    local title_pay_type_param = ""
+    if msg_body.title_pay_type~="" then
+        title_pay_type_param =  " AND title_pay_type = "..msg_body.title_pay_type
+    end
+
+    local is_boost_param = ""
+    if msg_body.is_boost~="" then
+        is_boost_param =  " AND is_boost = "..msg_body.is_boost
+    end
+
+    local is_reservation_param = ""
+    if msg_body.is_reservation~="" then
+        is_reservation_param =  " AND is_reservation = "..msg_body.is_reservation
+    end
+
+    local title_type_id_param = ""
+    if msg_body.title_type_id~="" then
+        title_type_id_param =  " AND title_type_id = "..msg_body.title_type_id
+    end
+
     local is_group_record_param = ""
     if msg_body.is_group_record~="" then
         is_group_record_param =  " AND is_group_record = "..msg_body.is_group_record
@@ -239,7 +259,7 @@ function M.search(msg_body)
     --     genre_param =  string.format(" AND genre = %d ",msg_body.genre) 
     -- end
 
-    local param = is_group_record_param..tf_time_interval_param..mini_program_platform_id_param..is_comment_param..material_rule_id_param..parent_main_id_param..tg_day_param..id_param..ads_operation_status_param..statistics_platform_id_param..converted_time_duration_param..infra_status_param..cbo_script_status_param..cbo_status_param..project_type_param..oce_product_platform_id_param..oce_product_id_param..delivery_mode_param..main_name_param..tg_platform_param..running_status_param..pay_type_param..butler_id_param..tg_app_index_param..is_open_create_link_param..is_delete_param..custom_budget_param..cpa_bid_param..template_bid_param..wx_miniapp_create_status_param..material_platform_id_param;
+    local param = title_pay_type_param..is_boost_param..is_reservation_param..title_type_id_param..is_group_record_param..tf_time_interval_param..mini_program_platform_id_param..is_comment_param..material_rule_id_param..parent_main_id_param..tg_day_param..id_param..ads_operation_status_param..statistics_platform_id_param..converted_time_duration_param..infra_status_param..cbo_script_status_param..cbo_status_param..project_type_param..oce_product_platform_id_param..oce_product_id_param..delivery_mode_param..main_name_param..tg_platform_param..running_status_param..pay_type_param..butler_id_param..tg_app_index_param..is_open_create_link_param..is_delete_param..custom_budget_param..cpa_bid_param..template_bid_param..wx_miniapp_create_status_param..material_platform_id_param;
     local sql = "SELECT * FROM tg_main where 1=1 "..param..string.format(" LIMIT %d OFFSET %d ",page_size, offset)
     local res = mysqldbx.query(sql)
     skynet.error("sql:",sql)
@@ -262,13 +282,17 @@ end
 -- `daily_new_limit` int DEFAULT '0' COMMENT '今天新上数量上限',
 
 function M.addMain(msg_body)
-    local isok ,key =  tools.checkData({"is_group_record","tf_time_interval","mat_roi","reduce_roi","boost_high_price_end_time","boost_high_price_number","reduce_consume_amount","reduce_bid_amount","is_comment","convert_cnt","material_rule_id","material_rule_number","parent_main_id","valid_timer_like_num","tg_day","ads_operation_status","statistics_platform_id","hide_if_converted","converted_time_duration","cbo_script_time","cbo_script_status","cbo_status","project_type","tf_status","tf_start_time","stat_cost","oce_product_id","oce_product_platform_id","material_platform_id","strategy_config","delivery_mode","price","pack_strategy_status","start_chapter","advertiser_id","wx_miniapp_create_status","ad_act","template_bid","zh_id","roi_goal","ql_bid","infra_status","pay_type","qm_id","ldy_template_site_id","yw_id","parent_platform_id","platform_shared_id","distributor_id","is_delete","ad_convert_type","aweme_id","tg_app_index","butler_id","mini_program_platform_id","landing_page","valid_timer_time","valid_timer_number","channelId","no_bid_budget","max_ad_quantity","tg_link_config","tg_platform_id","app_id","main_name","running_status","ad_quantity","cpa_bid","bid_type","bid_ratio","custom_budget","daily_new_limit","valid_time","group_id"},msg_body)
+    local isok ,key =  tools.checkData({"title_pay_type","is_boost","is_reservation","title_type_id","is_group_record","tf_time_interval","mat_roi","reduce_roi","boost_high_price_end_time","boost_high_price_number","reduce_consume_amount","reduce_bid_amount","is_comment","convert_cnt","material_rule_id","material_rule_number","parent_main_id","valid_timer_like_num","tg_day","ads_operation_status","statistics_platform_id","hide_if_converted","converted_time_duration","cbo_script_time","cbo_script_status","cbo_status","project_type","tf_status","tf_start_time","stat_cost","oce_product_id","oce_product_platform_id","material_platform_id","strategy_config","delivery_mode","price","pack_strategy_status","start_chapter","advertiser_id","wx_miniapp_create_status","ad_act","template_bid","zh_id","roi_goal","ql_bid","infra_status","pay_type","qm_id","ldy_template_site_id","yw_id","parent_platform_id","platform_shared_id","distributor_id","is_delete","ad_convert_type","aweme_id","tg_app_index","butler_id","mini_program_platform_id","landing_page","valid_timer_time","valid_timer_number","channelId","no_bid_budget","max_ad_quantity","tg_link_config","tg_platform_id","app_id","main_name","running_status","ad_quantity","cpa_bid","bid_type","bid_ratio","custom_budget","daily_new_limit","valid_time","group_id"},msg_body)
     if not isok then
         return false,string.format("缺少字段： %s.", key)
     end
     local current_time = os.date("%Y-%m-%d %H:%M:%S")
     msg_body.create_time = current_time
-    local sql = string.format("INSERT INTO `tg_main` (is_group_record,tf_time_interval,mat_roi,reduce_roi,boost_high_price_end_time,boost_high_price_number,reduce_consume_amount,reduce_bid_amount,is_comment,convert_cnt,material_rule_id,material_rule_number,parent_main_id,valid_timer_like_num,tg_day,ads_operation_status,statistics_platform_id,hide_if_converted,converted_time_duration,cbo_script_time,cbo_script_status,cbo_status,project_type,tf_status,tf_start_time,stat_cost,oce_product_id,oce_product_platform_id,material_platform_id,strategy_config,delivery_mode,price,pack_strategy_status,start_chapter,advertiser_id,wx_miniapp_create_status,genre,ad_act,template_bid,zh_id,roi_goal,ql_bid,infra_status,pay_type,qm_id,ldy_template_site_id,yw_id,parent_platform_id,platform_shared_id,distributor_id,is_delete,ad_convert_type,aweme_id,tg_app_index,butler_id,mini_program_platform_id,landing_page,valid_timer_time,valid_timer_number,channelId,no_bid_budget,max_ad_quantity,tg_link_config,tg_platform_id,app_id,main_name,running_status,ad_quantity,cpa_bid,bid_type,bid_ratio,custom_budget,daily_new_limit,valid_time,group_id)  VALUES (%d,%d,%f,%f,%d,%d,%f,%f,%d,%d,%d,%d,  %d,%d,%d,'%s',%d, '%s','%s','%s',%d,%d,%d,%d,'%s',%d,'%s','%s',%d,'%s','%s',%d,%d,%d,%s,%d,%d,%d,%d,'%s',%d,%d,%d,%d,'%s','%s','%s',%d,%d,'%s',%d,'%s','%s', %d, %d, %d,'%s', %d, '%s', '%s',%d, %d, '%s', %d, '%s', '%s', %d, %d, %d,%d, '%s', %d, %d, '%s', '%s')",
+    local sql = string.format("INSERT INTO `tg_main` (title_pay_type,is_boost,is_reservation,title_type_id,is_group_record,tf_time_interval,mat_roi,reduce_roi,boost_high_price_end_time,boost_high_price_number,reduce_consume_amount,reduce_bid_amount,is_comment,convert_cnt,material_rule_id,material_rule_number,parent_main_id,valid_timer_like_num,tg_day,ads_operation_status,statistics_platform_id,hide_if_converted,converted_time_duration,cbo_script_time,cbo_script_status,cbo_status,project_type,tf_status,tf_start_time,stat_cost,oce_product_id,oce_product_platform_id,material_platform_id,strategy_config,delivery_mode,price,pack_strategy_status,start_chapter,advertiser_id,wx_miniapp_create_status,genre,ad_act,template_bid,zh_id,roi_goal,ql_bid,infra_status,pay_type,qm_id,ldy_template_site_id,yw_id,parent_platform_id,platform_shared_id,distributor_id,is_delete,ad_convert_type,aweme_id,tg_app_index,butler_id,mini_program_platform_id,landing_page,valid_timer_time,valid_timer_number,channelId,no_bid_budget,max_ad_quantity,tg_link_config,tg_platform_id,app_id,main_name,running_status,ad_quantity,cpa_bid,bid_type,bid_ratio,custom_budget,daily_new_limit,valid_time,group_id)  VALUES (%d,%d, %d,%d, %d,%d,%f,%f,%d,%d,%f,%f,%d,%d,%d,%d,  %d,%d,%d,'%s',%d, '%s','%s','%s',%d,%d,%d,%d,'%s',%d,'%s','%s',%d,'%s','%s',%d,%d,%d,%s,%d,%d,%d,%d,'%s',%d,%d,%d,%d,'%s','%s','%s',%d,%d,'%s',%d,'%s','%s', %d, %d, %d,'%s', %d, '%s', '%s',%d, %d, '%s', %d, '%s', '%s', %d, %d, %d,%d, '%s', %d, %d, '%s', '%s')",
+    msg_body.title_pay_type,
+    msg_body.is_boost,
+    msg_body.is_reservation,
+    msg_body.title_type_id,
     msg_body.is_group_record,
     msg_body.tf_time_interval,
     msg_body.mat_roi,
@@ -480,7 +504,7 @@ local function combine_query_and_params(query, params)
     return combined_query
 end
 function M.modifyMain(msg_body)
-    local isok ,key =  tools.checkData({"is_group_record","tf_time_interval","mat_roi","reduce_roi","boost_high_price_end_time","boost_high_price_number","reduce_consume_amount","reduce_bid_amount","is_comment","convert_cnt","material_rule_id","material_rule_number","valid_timer_like_num","tg_day","ads_operation_status" ,"statistics_platform_id","hide_if_converted","converted_time_duration","cbo_script_time","cbo_script_status","cbo_status","project_type","tf_status","tf_start_time","stat_cost","oce_product_id","oce_product_platform_id","material_platform_id","strategy_config","delivery_mode","price","pack_strategy_status","start_chapter","advertiser_id","wx_miniapp_create_status","ad_act","template_bid","zh_id","roi_goal","ql_bid","infra_status","pay_type","pay_type","qm_id","ldy_template_site_id","yw_id","parent_platform_id","platform_shared_id","distributor_id","is_delete","ad_convert_type","aweme_id","tg_app_index","butler_id","mini_program_platform_id","landing_page","valid_timer_time","valid_timer_number","channelId","no_bid_budget","max_ad_quantity","tg_link_config","id","tg_platform_id","app_id","main_name","running_status","ad_quantity","cpa_bid","bid_type","bid_ratio","custom_budget","daily_new_limit","valid_time","group_id"},msg_body)
+    local isok ,key =  tools.checkData({"title_pay_type","is_boost","is_reservation","title_type_id","is_group_record","tf_time_interval","mat_roi","reduce_roi","boost_high_price_end_time","boost_high_price_number","reduce_consume_amount","reduce_bid_amount","is_comment","convert_cnt","material_rule_id","material_rule_number","valid_timer_like_num","tg_day","ads_operation_status" ,"statistics_platform_id","hide_if_converted","converted_time_duration","cbo_script_time","cbo_script_status","cbo_status","project_type","tf_status","tf_start_time","stat_cost","oce_product_id","oce_product_platform_id","material_platform_id","strategy_config","delivery_mode","price","pack_strategy_status","start_chapter","advertiser_id","wx_miniapp_create_status","ad_act","template_bid","zh_id","roi_goal","ql_bid","infra_status","pay_type","pay_type","qm_id","ldy_template_site_id","yw_id","parent_platform_id","platform_shared_id","distributor_id","is_delete","ad_convert_type","aweme_id","tg_app_index","butler_id","mini_program_platform_id","landing_page","valid_timer_time","valid_timer_number","channelId","no_bid_budget","max_ad_quantity","tg_link_config","id","tg_platform_id","app_id","main_name","running_status","ad_quantity","cpa_bid","bid_type","bid_ratio","custom_budget","daily_new_limit","valid_time","group_id"},msg_body)
     if not isok then
         return false,string.format("缺少字段： %s.", key)
     end
@@ -490,6 +514,10 @@ function M.modifyMain(msg_body)
 
     local query = [[
     UPDATE `tg_main` SET
+        title_pay_type = ?,
+        is_boost = ?,
+        is_reservation = ?,
+        title_type_id = ?,
         is_group_record = ?,
         tf_time_interval = ?,
         mat_roi = ?,
@@ -569,6 +597,10 @@ function M.modifyMain(msg_body)
 ]]
 
 local params = {
+    msg_body.title_pay_type,
+    msg_body.is_boost,
+    msg_body.is_reservation,
+    msg_body.title_type_id,
     msg_body.is_group_record,
     msg_body.tf_time_interval,
     msg_body.mat_roi,

service/backmgr/origin_video_titles.lua

@@ -20,14 +20,15 @@ function M.delete_origin_video_titles(msg_body)
 end
 
 function M.publish_origin_video_titles(msg_body)
-    local isok ,key =  tools.checkData({"title_list"},msg_body)
+    local isok ,key =  tools.checkData({"title_list","pay_type","title_type_id"},msg_body)
     if not isok then
         return false,string.format("缺少字段： %s.", key)
     end
-
+    local pay_type = msg_body.pay_type
+    local title_type_id = msg_body.title_type_id
     for i = 1, #msg_body.title_list, 1 do
         local title_tab = msg_body.title_list[i]
-        local sql  = string.format("INSERT INTO `video_titles` (title,md5_tag)  VALUES ('%s','%s')",title_tab.title,title_tab.md5_tag)
+        local sql  = string.format("INSERT INTO `video_titles` (title,md5_tag,pay_type,title_type_id)  VALUES ('%s','%s' ,%d,%d)",title_tab.title,title_tab.md5_tag,pay_type,title_type_id)
         mysqldbx.query(sql)
         sql = string.format("DELETE FROM origin_video_titles WHERE id = %d ",title_tab.id)
         mysqldbx.query(sql)
@@ -55,7 +56,7 @@ function M.search_origin_video_titles(msg_body)
         create_date_param = " AND DATE(create_time) >= DATE(FROM_UNIXTIME(" .. (msg_body.start_create_time / 1000) .. ")) AND DATE(create_time) <= DATE(FROM_UNIXTIME(" .. (msg_body.end_create_time / 1000) .. "))"
     end
 
-    local sql = "SELECT * FROM origin_video_titles WHERE 1=1 "..create_date_param..content_param..string.format("  AND (title LIKE CONCAT( '%%%s%%')) ",msg_body.content)..string.format(" LIMIT %d OFFSET %d ",page_size, offset)
+    local sql = "SELECT * FROM origin_video_titles WHERE 1=1 "..create_date_param..content_param..string.format("  AND (title LIKE CONCAT( '%%%s%%')) ",msg_body.content).." ORDER BY id DESC "..string.format(" LIMIT %d OFFSET %d ",page_size, offset)
     local list = mysqldbx.query(sql)
     sql = "SELECT   COUNT(*) AS total  FROM origin_video_titles  WHERE 1=1 "..create_date_param..content_param..string.format(" AND  (title LIKE CONCAT( '%%%s%%')) ",msg_body.content)
     local total = mysqldbx.query(sql)

service/backmgr/video_titles.lua

@@ -7,23 +7,25 @@ local md5 =	require	"md5"
 
 
 function M.add_video_title(msg_body)
-    local isok ,key =  tools.checkData({"title_list"},msg_body)
+    local isok ,key =  tools.checkData({"title_list","pay_type","title_type_id"},msg_body)
     if not isok then
         return false,string.format("缺少字段： %s.", key)
     end
+    local pay_type = msg_body.pay_type
+    local title_type_id = msg_body.title_type_id
     for i = 1, #msg_body.title_list, 1 do
         local title = msg_body.title_list[i].title
         local md5_tag = msg_body.title_list[i].md5_tag
         local sql = string.format("SELECT * FROM video_titles WHERE md5_tag = '%s' LIMIT 1", md5_tag)
         local isok,res;
+
         res = mysqldbx.query(sql)
         if #res > 0 then
-
+            -- return false, string.format("没有这个md5 %s.", md5_tag)
         else
-            sql = string.format("INSERT INTO `video_titles` (title,md5_tag)  VALUES ('%s','%s')",title,md5_tag)
-            mysqldbx.query(sql)
+            sql = string.format("INSERT INTO `video_titles` (title,md5_tag,pay_type,title_type_id)  VALUES ('%s','%s',%d,%d)",title,md5_tag,pay_type,title_type_id)
+            res = mysqldbx.query(sql)
         end
-
     end
     return true, {}
 end
@@ -42,27 +44,65 @@ function M.delete_video_title(msg_body)
 end
 
 function M.modify_video_title(msg_body)
-    local isok ,key =  tools.checkData({"title","md5_tag","id"},msg_body)
+    local isok ,key =  tools.checkData({"title","md5_tag","id","pay_type","title_type_id"},msg_body)
     if not isok then
         return false,string.format("缺少字段： %s.", key)
     end
-    local sql = string.format("UPDATE  video_titles SET title = '%s' , md5_tag = '%s' WHERE id = %d ",msg_body.title,msg_body.md5_tag,msg_body.id)
+    local sql = string.format("UPDATE  video_titles SET title_type_id = %d , pay_type = %d , title = '%s' , md5_tag = '%s' WHERE id = %d ",msg_body.title_type_id,msg_body.pay_type,msg_body.title,msg_body.md5_tag,msg_body.id)
+    mysqldbx.query(sql)
+    return true, {}
+end
+
+function M.modify_pay_type(msg_body)
+    local isok ,key =  tools.checkData({"id_list","pay_type"},msg_body)
+    if not isok then
+        return false,string.format("缺少字段： %s.", key)
+    end
+    local idString = table.concat(msg_body.id_list, ",")
+    sql = string.format("UPDATE `video_titles` SET pay_type = %d WHERE id IN (%s) ",msg_body.pay_type,idString)
+    mysqldbx.query(sql)
+    return true, {}
+end
+
+function M.modify_title_type_id(msg_body)
+    local isok ,key =  tools.checkData({"id_list","title_type_id"},msg_body)
+    if not isok then
+        return false,string.format("缺少字段： %s.", key)
+    end
+    local idString = table.concat(msg_body.id_list, ",")
+    sql = string.format("UPDATE `video_titles` SET title_type_id = %d WHERE id IN (%s) ",msg_body.title_type_id,idString)
     mysqldbx.query(sql)
     return true, {}
 end
 
 function M.search_video_title(msg_body)
-    local isok ,key =  tools.checkData({"page_size","page_number","content"},msg_body)
+    local isok ,key =  tools.checkData({"page_size","page_number","content","pay_type","title_type_id"},msg_body)
     if not isok then
         return false,string.format("缺少字段： %s.", key)
     end
     local page_size = msg_body.page_size
     local page_number = msg_body.page_number
     local offset = (page_number - 1) * page_size
-    
-    local sql = "SELECT * FROM video_titles "..string.format(" WHERE  (title LIKE CONCAT( '%%%s%%')) ",msg_body.content)..string.format(" LIMIT %d OFFSET %d ",page_size, offset)
+
+    local content_param = ""
+    if msg_body.content~=""then
+        content_param = string.format(" AND  (title LIKE CONCAT( '%%%s%%')) ",msg_body.content)
+    end
+
+    local pay_type_param = ""
+    if msg_body.pay_type~=""then
+        pay_type_param = string.format(" AND  pay_type = %d ",msg_body.pay_type)
+    end
+
+    local title_type_id_param = ""
+    if msg_body.title_type_id~=""then
+        title_type_id_param = string.format(" AND  title_type_id = %d ",msg_body.title_type_id)
+    end
+
+    local param = content_param..pay_type_param..title_type_id_param
+    local sql = "SELECT * FROM video_titles WHERE 1=1 "..param.." ORDER BY id DESC ".. string.format(" LIMIT %d OFFSET %d ",page_size, offset)
     local list = mysqldbx.query(sql)
-    sql = "SELECT   COUNT(*) AS total  FROM video_titles "..string.format(" WHERE  (title LIKE CONCAT( '%%%s%%')) ",msg_body.content)
+    sql = "SELECT   COUNT(*) AS total  FROM video_titles  WHERE 1=1 "..param
     local total = mysqldbx.query(sql)
     return true,list,total[1].total
 end