接口新增

config.yaml

@@ -4,4 +4,5 @@ mysql:
   userName: root
   passWord: =PDT49#80Z!RVv52_z
   maxOpenConns: 5
-  maxIdleConns: 5
+  maxIdleConns: 5
+port: 3002

user/index.lua

@@ -21,7 +21,6 @@ findOne = function()
             local user_mold = user.user_mold
             if user_mold == "1" or user_mold == "3" then
                 data = {
-                    user_id = user.user_id,
                     registe_time = user.registe_time
                 }
             else
@@ -32,13 +31,11 @@ findOne = function()
                     sales_ent_name = user.sales_ent_name,
                     sales_position = user.sales_position,
                     sales_dep = user.sales_dep,
-                    mailbox = user.mailbox,
                     order_type = user.order_type,
                     source = user.source,
                     data_request = user.data_request,
                     last_login_time = user.last_login_time,
                     sales_leads_source = user.sales_leads_source
-
                 }
             end
         end
@@ -50,24 +47,27 @@ findOne = function()
 end
 userList = function()
     content("application/json")
-    local time = formdata().time
-    local paseInt = formdata().page
-    local pageSizeInt = formdata().pageSize
-    local query = "select count(1) as count from  user_source a   where DATE(create_time)=\"" .. time .. "\""
-    local countResults = mysql(query, address())
     local resultData = {
         error_code = 1,
         error_msg = "",
     }
-    resultData.error_code = 0
+    local cursor = formdata().cursor
+    local pageSizeInt = formdata().pageSize
+    if tonumber(cursor) < 0 or tonumber(pageSizeInt) <= 0 or tonumber(pageSizeInt) > 100 then
+        resultData.error_code = "1018"
+        resultData.error_msg = "无效参数"
+        print(json(resultData))
+        return
+    end
+    local query = "select count(1) as count from  user_source a   where id >\"" .. cursor .. "\""
+    local countResults = mysql(query, address())
     if #countResults > 0 then
         --查询数据
-        local start = (paseInt - 1) * pageSizeInt
-        query = "select encryption_user_id,create_time,login_way,platform,ip from  user_source a   where DATE(create_time)=\"" .. time .. "\" ORDER BY create_time limit " .. start .. "," .. pageSizeInt
+        query = "select encryption_user_id,id,create_time,login_way,platform,id,SUBSTRING_INDEX(ip,',',1) as ip  from  user_source    where id>\"" .. cursor .. "\" ORDER BY id limit 0," .. pageSizeInt
         local results = mysql(query, address())
         resultData.data = {
             userCount = countResults[1].count,
-            userLisr = results
+            userList = results
         }
     else
         resultData.data = {
@@ -76,8 +76,65 @@ userList = function()
     end
     print(json(resultData))
 end
+
+detailsList = function()
+    content("application/json")
+    local cursor = formdata().cursor
+    local pageSizeInt = formdata().pageSize
+    local resultData = {
+        error_code = 1,
+        error_msg = "",
+    }
+    local dataList = {}
+    local query = "select  count(1) as count from  user_channel_info  where  id > \"" .. cursor .. "\""
+    local countResults = mysql(query, address())
+    if #countResults > 0 then
+
+    else
+        resultData.data = {
+            userCount = 0
+        }
+        print(json(resultData))
+        return
+    end
+    --query = "select  * from  user_channel_info  where  id >  \"" .. cursor .. "\"    ORDER BY id LIMIT 0 ," .. pageSizeInt
+    query="select a.id as  infoId, a.*,(select   b.encryption_user_id from  user_source b  where  a.user_id=b.user_id LIMIT 1) as encryption_user_id from  user_channel_info a where  a.id >\"" .. cursor .. "\"  ORDER BY a.id  LIMIT 0 ," .. pageSizeInt
+    local userResults = mysql(query, address())
+    for _,user in ipairs(userResults) do
+        local user_mold = user.user_mold
+        if user_mold == "1" or user_mold == "3" then
+            data = {
+                registe_time = user.registe_time,
+            }
+        else
+            data = {
+                phone = user.phone,
+                registe_time = user.registe_time,
+                sales_lead_phone = user.sales_lead_phone,
+                sales_ent_name = user.sales_ent_name,
+                sales_position = user.sales_position,
+                sales_dep = user.sales_dep,
+                order_type = user.order_type,
+                source = user.source,
+                data_request = user.data_request,
+                last_login_time = user.last_login_time,
+                sales_leads_source = user.sales_leads_source,
+            }
+        end
+        data.encryption_user_id = user.encryption_user_id
+        data.id=user.infoId
+        table.insert(dataList, data)
+    end
+    resultData.data={
+        userList=dataList,
+        count=countResults[1].count
+    }
+    print(json(resultData))
+end
+
 handle("/user/list", userList)
 handle("/user/findOne", findOne)
+handle("/user/detailsList", detailsList)