Merge branch 'master' of http://123.207.147.179:8888/node_server/wenHuaBu_adminServer

src/biz/member/memberFees.ts

@@ -5,7 +5,7 @@
 import moment = require("moment");
 import { MEMBERSTATE, MEMBERTYPE, ORDERSTATE, PAYMENTTYPE, RECEIPTCONFIRMATION, STATE, UNITMEMBERTYPE, USERREGISTERSTATE } from "../../config/enum";
 import { TABLEENUM } from "../../data/models/model";
-import { find, findCount, findOnce, findToPage, findToSort } from "../../data/select";
+import { find, findCount, findOnce, findToPage, findToSort, findToSortToPage } from "../../data/select";
 import { extractData } from "../../util/piecemeal";
 import { changeEnumValue } from "../../util/verificationEnum";
 import { BizError } from "../../util/bizError";
@@ -160,7 +160,8 @@ export async function unpaidList({name, memberType, documentId, phone, mail, joi
     
 
     const SelectFiles = ["userId", "memberState", "unitName", "loginId", "phone", "joinTime", "memberType", "lifespanStartTime", "lifespanEndTime"];
-    let dbList = await findToPage(TABLEENUM.用户表, selectParam, SelectFiles, pageNumber, 10);
+    // let dbList = await findToPage(TABLEENUM.用户表, selectParam, SelectFiles, pageNumber, 10);
+    let dbList = await findToSortToPage(TABLEENUM.用户表, selectParam, SelectFiles, {joinTime:-1}, pageNumber);
     let dataCount = await findCount(TABLEENUM.用户表, selectParam);
 
     let dataList = [];

src/data/models/model.ts

@@ -354,7 +354,7 @@ const ModelArray = [
             token:{type:'String', default:''},//token
             tokenMs:{type:'Number', default:0},//token过期时间
             lastLoginMs:'Number',//上次登陆时间
-            session:'Number',//届次
+            session:'Number',//届次【规则：五年一届半年一次（10次一届）】 数据库保存格式：200801【年月（YYYYMM）】
             paymentStatus:'Number',//支付状态 PAYMENTSTATUS
             isInput:{type:'Boolean', default:false},//是否是导入用户
             inputUserChangePwd:{type:'Boolean', default:false},