no message

src/biz/member/examine.ts

@@ -5,11 +5,11 @@
 import moment = require("moment");
 import { BANXUELEIXING, CERTIFICATETYPE, DOCUMENTTYPE, EDUCATION, INDIVIDUALMEMBERTYPE, LOGONSTATE, MAILTYPE, MEMBERLEVEL, MEMBERSTATE, MEMBERTYPE, MEMBERTYPEECCENUM, NATION, OPERATIONREHAVIOR, PAYMENTSTATUS, PROFCATEGORY, REGISTERFLOW, REGISTERFLOWCLIENT, SEX, STATE, UNITMEMBERTYPE, USERREGISTERSTATE } from "../../config/enum";
 import { ERRORENUM } from "../../config/errorEnum";
-import { addManyData } from "../../data/add";
+import { addManyData, addOneData } from "../../data/add";
 import { TABLEENUM } from "../../data/models/model";
 import { find, findCount, findOnce, findToSortToPage } from "../../data/select";
 import { updateOneData } from "../../data/update";
-import { generateSystemId, getEdition, getMenberNum, getSessionByEdition, successResult } from "../../tools/system";
+import { generateSystemId, getEdition, getMenberNum, getSessionByEdition, sessionToJoinTime, successResult } from "../../tools/system";
 import { BizError } from "../../util/bizError";
 import { extractData } from "../../util/piecemeal";
 import { changeEnumValue } from "../../util/verificationEnum";
@@ -414,24 +414,18 @@ export async function adopt({id, session}) {
     const NowMs = thisDate.valueOf();
     
     let userCount = await findCount(TABLEENUM.用户表, {isAdmin:0, memberType:userInfo.memberType,  userRegisterState:USERREGISTERSTATE.通过});
-    let memberNum = getMenberNum(thisDate, userInfo.sheng, userCount, userInfo.memberType);
 
-    let joinTime = 0;
-    let orderTimeMs = 0;
-    let sessionDate = getSessionByEdition(Math.floor(session/100),Math.floor(session%100));
-    if (sessionDate) {
-        joinTime = sessionDate.timeMs;
-    } else {
-        joinTime = new Date().valueOf();
-    }
+    let joinTime = await sessionToJoinTime(session, id);
+    let memberNum = getMenberNum(joinTime, userInfo.sheng, userCount, userInfo.memberType);
+    // getSessionByEdition(Math.floor(session/100),Math.floor(session%100));
     let updateInfo:any = {
         auditTime:NowMs,
         joinTime,
         userRegisterState:USERREGISTERSTATE.通过,
         session:session,
         paymentStatus:PAYMENTSTATUS.未支付,
-        lifespanStartTime:NowMs,
-        lifespanEndTime:NowMs + 1000,
+        lifespanStartTime:joinTime,
+        lifespanEndTime:joinTime + 1000,
         memberLevel:MEMBERLEVEL.普通会员,
         memberState:MEMBERSTATE.异常,
         memberNum
@@ -504,15 +498,8 @@ export async function batchAdopt({idList, session}) {
         }
 
         let userCount = await findCount(TABLEENUM.用户表, {isAdmin:0, memberType:userInfo.memberType,  userRegisterState:USERREGISTERSTATE.通过});
-        let memberNum = getMenberNum(thisDate, userInfo.sheng, userCount, userInfo.memberType);
-    
-        let joinTime = 0;
-        let sessionDate = getSessionByEdition(Math.floor(session/100),Math.floor(session%100));
-        if (sessionDate) {
-            joinTime = sessionDate.timeMs;
-        } else {
-            joinTime = new Date().valueOf();
-        }
+        let joinTime = await sessionToJoinTime(session, id);
+        let memberNum = getMenberNum(joinTime, userInfo.sheng, userCount, userInfo.memberType);
 
         let updateInfo:any = {
             auditTime:NowMs,

src/config/serverConfig.ts

@@ -7,7 +7,7 @@ const os = require('os');
 
 export let systemConfig =  new ServerConfig;
 export const SessionTimeMsConfig = {
-  "5_1":{activTime:'2013-3-30 08:00:00', timeMs:new Date('2013-3-30 08:00:00').valueOf()},
+    "5_1":{activTime:'2013-3-30 08:00:00', timeMs:new Date('2013-3-30 08:00:00').valueOf()},
     "5_2":{activTime:'2014-4-24 08:00:00', timeMs:new Date('2014-4-24 08:00:00').valueOf()},
     "5_3":{activTime:'2015-4-10 08:00:00', timeMs:new Date('2015-4-10 08:00:00').valueOf()},
     "5_4":{activTime:'2015-11-4 08:00:00', timeMs:new Date('2015-11-4 08:00:00').valueOf()},

src/data/models/model.ts

@@ -98,6 +98,7 @@ enum TABLEENUM {
     理事变更审批历史表 = "applyHistoryList",
     系统表 = "systemConfig",
     资料变更审批历史表 = "infomationChangeHistory",
+    届次表 = "sessionConfig",
 }
 
 const ModelArray = [
@@ -686,6 +687,16 @@ const ModelArray = [
             value:{type:'String', index:true},//值
         }
     },
+    {
+        tableName:TABLEENUM.届次表,
+        source:TABLESOURCEENUM.mongo,
+        schema:{
+            sId:{type: 'String', index:true},
+            session:'Number',//届次【规则：五年一届半年一次（10次一届）】 数据库保存格式：200801【年月（YYYYMM）】
+            joinTime:'Number',//入会时间 届次绑定入会时间，旧的时间线对应届次按照之前的配置来，新届次对应入会时间按照新届次第一次被审核时间
+        }
+
+    }
 ];
 
 

src/tools/system.ts

@@ -8,6 +8,9 @@ import moment = require("moment");
 import { wenZhangQueue } from "../biz/task";
 import { MEMBERTYPE } from "../config/enum";
 import { SessionTimeMsConfig } from "../config/serverConfig";
+import { TABLEENUM } from "../data/models/model";
+import { findOnce } from "../data/select";
+import { addOneData } from "../data/add";
 const md5 = require("md5");
 
 /**
@@ -125,8 +128,6 @@ export function getSessionByEdition(year, month) {
  * 下拉选择起始届次：2008年第四届第一次
  * @returns 
  */
-
-
 export function getEdition(year, month) {
     //起始年份和月份 第一届第一次
     const startYear = 1993;
@@ -225,6 +226,29 @@ export function getMenberNum( joinTime, sheng, userCount, memberType) {
 
 
 /**
+ * 通过届次获取入会时间
+ */
+export async function sessionToJoinTime(session, id) {
+    let joinTime = 0;
+    let sessionDate = await findOnce(TABLEENUM.届次表, {session});
+    if (!sessionDate) {
+        joinTime = new Date().valueOf();
+
+        let addInfo = {
+            sId:generateSystemId(TABLEENUM.届次表, id),
+            session,
+            joinTime
+        }
+        await addOneData(TABLEENUM.届次表, addInfo);
+    } else {
+        joinTime = sessionDate.joinTime;
+    }
+
+    return joinTime;
+}
+
+
+/**
  * 生成密码
  * @param userId 
  * @returns