904118851 4 долоо хоног өмнө
parent
commit
ca9504152a

+ 21 - 5
common/dbproxy/tg_main.lua

@@ -64,7 +64,7 @@ end
 
 function M.search(msg_body)
 
-    local isok ,key =  tools.checkData({"tg_app_index_list","aigc_status","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",
+    local isok ,key =  tools.checkData({"tf_support_status","internal_advertiser_classify","tg_app_index_list","aigc_status","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,16 @@ function M.search(msg_body)
 
     local offset = (page_number - 1) * page_size
 
+    local tf_support_status_param = ""
+    if msg_body.tf_support_status~="" then
+        tf_support_status_param =  " AND tf_support_status = "..msg_body.tf_support_status
+    end
+
+    local internal_advertiser_classify_param = ""
+    if msg_body.internal_advertiser_classify~="" then
+        internal_advertiser_classify_param =  string.format(" AND internal_advertiser_classify = '%s' ",msg_body.internal_advertiser_classify)
+    end
+
     local tg_app_index_list_param = ""
     if msg_body.tg_app_index_list~="" then
         local idString = table.concat(msg_body.tg_app_index_list, ",")
@@ -270,7 +280,7 @@ function M.search(msg_body)
     --     genre_param =  string.format(" AND genre = %d ",msg_body.genre) 
     -- end
 
-    local param = tg_app_index_list_param..aigc_status_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 param = internal_advertiser_classify_param..tf_support_status_param..tg_app_index_list_param..aigc_status_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)
@@ -293,13 +303,15 @@ end
 -- `daily_new_limit` int DEFAULT '0' COMMENT '今天新上数量上限',
 
 function M.addMain(msg_body)
-    local isok ,key =  tools.checkData({"aigc_status","zy_conifg","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)
+    local isok ,key =  tools.checkData({"tf_support_status","internal_advertiser_classify","aigc_status","zy_conifg","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` (aigc_status,zy_conifg,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,'%s',%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')",
+    local sql = string.format("INSERT INTO `tg_main` (tf_support_status,internal_advertiser_classify,aigc_status,zy_conifg,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,'%s',%d,'%s',%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.tf_support_status,
+    msg_body.internal_advertiser_classify,
     msg_body.aigc_status,
     cjson.encode(msg_body.zy_conifg),
     msg_body.title_pay_type,
@@ -517,7 +529,7 @@ local function combine_query_and_params(query, params)
     return combined_query
 end
 function M.modifyMain(msg_body)
-    local isok ,key =  tools.checkData({"aigc_status","zy_conifg","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)
+    local isok ,key =  tools.checkData({"tf_support_status","internal_advertiser_classify","aigc_status","zy_conifg","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
@@ -527,6 +539,8 @@ function M.modifyMain(msg_body)
 
     local query = [[
     UPDATE `tg_main` SET
+        tf_support_status =?,
+        internal_advertiser_classify =?,
         aigc_status =?,
         zy_conifg =?,
         title_pay_type = ?,
@@ -612,6 +626,8 @@ function M.modifyMain(msg_body)
 ]]
 
 local params = {
+    msg_body.tf_support_status,
+    msg_body.internal_advertiser_classify,
     msg_body.aigc_status,
     cjson.encode(msg_body.zy_conifg),
     msg_body.title_pay_type,

+ 0 - 31
service/backmgr/filter_task.lua

@@ -295,37 +295,6 @@ end
 
 
 
---添加书籍数据
-function M.add_book_data(msg_body)
-    local isok ,key =  tools.checkData({"fee_mode","episode_price","seq_num","status","tg_platform_id","product_id","product_name"
-    ,"genre","is_store","start_chapter","publish_time"},msg_body)
-    if not isok then
-        return false,string.format("缺少字段: %s.", key)
-    end
-    local sql ;
-    local isok,res;
-    local sql = string.format("SELECT * FROM video_product where product_id = '%s'  LIMIT 1 ",msg_body.product_id)
-    res = mysqldtaskbx.Singleton().query(sql)
-
-    if #res>0 then
-        return false,"书籍已存在!"
-    end
-
-    sql = string.format("INSERT INTO `video_product` (fee_mode,episode_price,seq_num,status,book_platform,product_id, product_name, genre,is_store,is_auto,start_chapter,publish_time)  VALUES (%d,%d,%d,%d,%d,'%s','%s',%d,%d,0,%d,'%s')",
-    msg_body.fee_mode,
-    msg_body.episode_price,
-    msg_body.seq_num,
-    msg_body.status,
-    msg_body.tg_platform_id,
-    msg_body.product_id,
-    msg_body.product_name,
-    msg_body.genre,msg_body.is_store,msg_body.start_chapter,msg_body.publish_time)
-
-    res = mysqldtaskbx.Singleton().query(sql)
-    return true,{}
-end
-
-
 --发送书籍数据到主体
 function M.send_book_data(msg_body)
     local isok ,key =  tools.checkData({"tg_platform_id","app_id","id_list","main_id_list"},msg_body)

+ 73 - 2
service/backmgr/video_product.lua

@@ -231,12 +231,12 @@ function M.search_book_data(msg_body)
             up_down_param = " ORDER BY "..up_down_param
         end
 
-        local sql = "SELECT * FROM video_product where 1=1 "..param..up_down_param..string.format(" LIMIT %d OFFSET %d ",page_size, offset)
+        local sql = "SELECT * FROM video_product where 1=1 "..param..up_down_param.." ORDER BY id DESC "..string.format(" LIMIT %d OFFSET %d ",page_size, offset)
         
         skynet.error("sql:",sql)
         local res = mysqldtaskbx.Singleton().query(sql)
     
-        sql =  "SELECT  COUNT(*) AS total  FROM video_product where 1=1 "..param.."ORDER BY id DESC"
+        sql =  "SELECT  COUNT(*) AS total  FROM video_product where 1=1 "..param
     
         local total = mysqldtaskbx.Singleton().query(sql)
     
@@ -303,6 +303,19 @@ function M.set_seq_num(msg_body)
     mysqldtaskbx.Singleton().query(sql)
     return true, {}
 end
+
+--设置 专辑链接 album_link
+function M.set_album_link(msg_body)
+    local isok ,key =  tools.checkData({"album_link","id_list"},msg_body)
+    if not isok then
+        return false,string.format("缺少字段: %s.", key)
+    end
+    local idString = table.concat(msg_body.id_list, ",")
+    local sql = string.format("UPDATE  video_product SET album_link = '%s' WHERE id IN (%s) ",msg_body.album_link,idString)
+    mysqldtaskbx.Singleton().query(sql)
+    return true, {}
+end
+
 --设置书优先级
 function M.set_top(msg_body)
     local isok ,key =  tools.checkData({"expired_time","id_list"},msg_body)
@@ -332,6 +345,64 @@ function M.set_top(msg_body)
     return true, {}
 end
 
+--掌阅匹配专辑链接
+function M.zy_match_album_link_by_name(msg_body)
+    local isok ,key =  tools.checkData({"list"},msg_body)
+    if not isok then
+        return false,string.format("缺少字段: %s.", key)
+    end
+    local sql = ""
+    local res = nil
+    local notFindList = {}
+    for i = 1, #msg_body.list, 1 do
+        local item = msg_body.list[i]
+        local name = item.name
+        local album_link = item.album_link
+        sql = string.format("SELECT * FROM video_product where product_name = '%s' AND book_platform = 7  LIMIT 1 ",name)
+        res = mysqldtaskbx.Singleton().query(sql)
+        if #res>0 then
+            sql = string.format("UPDATE  video_product SET album_link = '%s' WHERE id = %d ",album_link,res[1].id)
+            mysqldtaskbx.Singleton().query(sql)
+        else
+            table.insert(notFindList,#notFindList+1,name)
+        end
+    end
+    return true, notFindList
+end
+
+--添加书籍数据
+function M.add_book_data(msg_body)
+    local isok ,key =  tools.checkData({"free_time","album_link","fee_mode","episode_price","seq_num","status","tg_platform_id","product_id","product_name"
+    ,"genre","is_store","start_chapter","publish_time"},msg_body)
+    if not isok then
+        return false,string.format("缺少字段: %s.", key)
+    end
+    local sql ;
+    local isok,res;
+    local sql = string.format("SELECT * FROM video_product where product_id = '%s'  LIMIT 1 ",msg_body.product_id)
+    res = mysqldtaskbx.Singleton().query(sql)
+
+    if #res>0 then
+        return false,"书籍已存在!"
+    end
+
+    sql = string.format("INSERT INTO `video_product` (free_time,album_link,fee_mode,episode_price,seq_num,status,book_platform,product_id, product_name, genre,is_store,is_auto,start_chapter,publish_time)  VALUES ('%s','%s',%d,%d,%d,%d,%d,'%s','%s',%d,%d,0,%d,'%s')",
+    msg_body.free_time,
+    msg_body.album_link,
+    msg_body.fee_mode,
+    msg_body.episode_price,
+    msg_body.seq_num,
+    msg_body.status,
+    msg_body.tg_platform_id,
+    msg_body.product_id,
+    msg_body.product_name,
+    msg_body.genre,msg_body.is_store,msg_body.start_chapter,msg_body.publish_time)
+
+    res = mysqldtaskbx.Singleton().query(sql)
+    tools.dump(res)
+    return true,{}
+end
+
 function mysqldtaskbx.start()
     local function on_connect(db)
         db:query("set charset utf8mb4");