123

0_RECEIVE_FACTORY/RECEIVE_FACTORY.js

@@ -551,12 +551,14 @@ CMD.hy_topUpTemplate = async function(res,accountId) {
     res.end(JSON.stringify({ message:"成功！",data:list,code:10000}));
  }
 
- CMD.get_zy_callback_template = async function(res,owner) {
+ CMD.get_zy_callback_template = async function(res,owner,page,size) {
     let token = await require('../src/api/zy/get_zy_token').get_token()
     let clinet = tools.getOneNewClinet()
     let response = await clinet.post(`https://openapi-gaia.zhangyue.com/opendata/reseller/pay/book/callback/list`,{
         access_token:token,
-        owner:parseInt(owner)
+        owner:parseInt(owner),
+        page:page,
+        size:size
     })
     let list = null
     if(response.data.code!=0){
@@ -568,12 +570,14 @@ CMD.hy_topUpTemplate = async function(res,accountId) {
     res.end(JSON.stringify({ message:"成功！",data:list,code:10000}));
  }
 
- CMD.get_zy_recharge_template =  async function(res,user_id) {
+ CMD.get_zy_recharge_template =  async function(res,user_id,page,size) {
     let token = await require('../src/api/zy/get_zy_token').get_token()
     let clinet = tools.getOneNewClinet()
     let response = await clinet.post(`https://openapi-gaia.zhangyue.com/opendata/reseller/pay/book/recharge`,{
         access_token:token,
-        user_id:parseInt(user_id)
+        user_id:parseInt(user_id),
+        page:page,
+        size:size
     })
     let list = null
     if(response.data.code!=0){
@@ -730,10 +734,14 @@ var server = http.createServer(function(req,res){
                         CMD.get_qm_mf_account_list(res) 
                     }else if(jsonData['fun']=="get_zy_recharge_template"&&jsonData['cmd']=="zy_link"){
                         let user_id = jsonData['data']['user_id']
-                        CMD.get_zy_recharge_template(res,user_id) 
+                        let page = jsonData['data']['page']==undefined?1:jsonData['data']['page']
+                        let size = jsonData['data']['size']==undefined?20:jsonData['data']['size']
+                        CMD.get_zy_recharge_template(res,user_id,page,size) 
                     }else if(jsonData['fun']=="get_zy_callback_template"&&jsonData['cmd']=="zy_link"){
                         let owner = jsonData['data']['owner']
-                        CMD.get_zy_callback_template(res,owner) 
+                        let page = jsonData['data']['page']==undefined?1:jsonData['data']['page']
+                        let size = jsonData['data']['size']==undefined?100:jsonData['data']['size']
+                        CMD.get_zy_callback_template(res,owner,page,size) 
                     }else if(jsonData['fun']=="get_zy_account_list"&&jsonData['cmd']=="zy_link"){
                         CMD.get_zy_account_list(res) 
                     }else{

src/data_manager/BaseModel.js

@@ -82,7 +82,7 @@ class BaseModel {
             .select()
             .from(this.tableName)
             .where(conditions)
-            .orderByWeight('id',orderBy)
+            // .orderByWeight('id',orderBy)
             .limit(limit)
             .getQuery();
         const results = await db.query(sql, params);