123

common/dbproxy/tg_app.lua

@@ -21,13 +21,15 @@ end
 --小程序名称 name
 --添加小程序
 function M.addApp(msg_body)
-    local isok ,key =  tools.checkData({"system_platform","wx_origin_id","butler_id","tg_platform_id","app_id","instance_id","name","advertiser_id","landing_page","titles"},msg_body)
+    local isok ,key =  tools.checkData({"copyright","oce_product_platform_id","system_platform","wx_origin_id","butler_id","tg_platform_id","app_id","instance_id","name","advertiser_id","landing_page","titles"},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_app` (system_platform,wx_origin_id,butler_id,tg_platform_id,app_id, instance_id, name,advertiser_id,landing_page,titles)  VALUES (%d,'%s',%d,%d,'%s','%s','%s','%s','%s','%s')",
+    local sql = string.format("INSERT INTO `tg_app` (copyright,oce_product_platform_id,system_platform,wx_origin_id,butler_id,tg_platform_id,app_id, instance_id, name,advertiser_id,landing_page,titles)  VALUES ('%s','%s',%d,'%s',%d,%d,'%s','%s','%s','%s','%s','%s')",
+    msg_body.copyright,
+    msg_body.oce_product_platform_id,
     msg_body.system_platform,
     msg_body.wx_origin_id,
     msg_body.butler_id,
@@ -42,14 +44,14 @@ end
 
 --修改小程序
 function M.modifyApp(msg_body)
-    local isok ,key =  tools.checkData({"system_platform","wx_origin_id","butler_id","id","tg_platform_id","app_id","instance_id","name","advertiser_id","landing_page","titles"},msg_body)
+    local isok ,key =  tools.checkData({"copyright","oce_product_platform_id","system_platform","wx_origin_id","butler_id","id","tg_platform_id","app_id","instance_id","name","advertiser_id","landing_page","titles"},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.update_time = current_time
-    local sql = string.format("UPDATE `tg_app` SET system_platform = %d , wx_origin_id = '%s' , butler_id = %d , tg_platform_id =%d ,app_id ='%s' , instance_id ='%s' , name ='%s' , advertiser_id ='%s'  , update_time ='%s'   , landing_page ='%s'  , titles ='%s' WHERE id = %d ",
-    msg_body.system_platform,msg_body.wx_origin_id,msg_body.butler_id,msg_body.tg_platform_id,msg_body.app_id,msg_body.instance_id,msg_body.name,msg_body.advertiser_id,msg_body.update_time,msg_body.landing_page,msg_body.titles,msg_body.id)
+    local sql = string.format("UPDATE `tg_app` SET copyright = '%s' , oce_product_platform_id = '%s' , system_platform = %d , wx_origin_id = '%s' , butler_id = %d , tg_platform_id =%d ,app_id ='%s' , instance_id ='%s' , name ='%s' , advertiser_id ='%s'  , update_time ='%s'   , landing_page ='%s'  , titles ='%s' WHERE id = %d ",
+    msg_body.copyright,msg_body.oce_product_platform_id,msg_body.system_platform,msg_body.wx_origin_id,msg_body.butler_id,msg_body.tg_platform_id,msg_body.app_id,msg_body.instance_id,msg_body.name,msg_body.advertiser_id,msg_body.update_time,msg_body.landing_page,msg_body.titles,msg_body.id)
     mysqldbx.query(sql)
     skynet.send("backmgr","lua","on_recv",nil,"ws_push_msg",cjson.encode({cmd="updateAppConfig"}))
     return true

service/backmgr/task_material_queue_queue.lua

@@ -26,7 +26,8 @@ function M.set_sweight(msg_body)
 end
 
 function M.search_task_material_queue_queue(msg_body)
-    local isok ,key =  tools.checkData({"id","butler_id","tg_main_id","page_size","page_number","start_create_time","end_create_time",
+    local isok ,key =  tools.checkData({"is_copy", "start_publish_time",
+    "end_publish_time","id","butler_id","tg_main_id","page_size","page_number","start_create_time","end_create_time",
     "tg_platform_id","advertiser_id","advertiser_name","product_id","product_name","material_id","status"},msg_body)
     if not isok then
         return false,string.format("缺少字段： %s.", key)
@@ -35,6 +36,16 @@ function M.search_task_material_queue_queue(msg_body)
     local page_number = msg_body.page_number
     local offset = (page_number - 1) * page_size
 
+    local date_param = ""
+    if msg_body.start_publish_time~="" and msg_body.end_publish_time~="" then
+        date_param = " AND DATE(publish_time) >= DATE(FROM_UNIXTIME(" .. (msg_body.start_publish_time / 1000) .. ")) AND DATE(publish_time) <= DATE(FROM_UNIXTIME(" .. (msg_body.end_publish_time / 1000) .. ")) "
+    end
+
+    local is_copy_param = ""
+    if msg_body.is_copy~="" then
+        is_copy_param =  " AND is_copy = "..msg_body.is_copy
+    end
+
     local id_param = ""
     if msg_body.id~="" then
         id_param =  " AND id = "..msg_body.id
@@ -92,7 +103,7 @@ function M.search_task_material_queue_queue(msg_body)
         create_date_param = " AND DATE(created_at) >= DATE(FROM_UNIXTIME(" .. (msg_body.start_create_time / 1000) .. ")) AND DATE(created_at) <= DATE(FROM_UNIXTIME(" .. (msg_body.end_create_time / 1000) .. "))"
     end
 
-    local param = id_param..tg_main_id_param..butler_id_param..tg_platform_id_param..advertiser_id_param..advertiser_name_param..product_id_param..product_name_param..material_id_param..status_param..create_date_param
+    local param = is_copy_param..date_param..id_param..tg_main_id_param..butler_id_param..tg_platform_id_param..advertiser_id_param..advertiser_name_param..product_id_param..product_name_param..material_id_param..status_param..create_date_param
 
     local sql = "SELECT * FROM task_material_queue_queue WHERE 1=1 "..param.." ORDER BY id DESC "..string.format(" LIMIT %d OFFSET %d ",page_size, offset)