no message

src/biz/member/cost.ts

@@ -2,7 +2,7 @@
  * 收费
  */
 
-import { MEMBERSTATE, ORDERSTATE, PAYMENTSTATUS, PAYMENTTYPE, RECEIPTCONFIRMATION, STATE, WEICHARTPAYSTATE } from "../../config/enum";
+import { MEMBERSTATE, ORDERSTATE, PAYMENTTYPE, RECEIPTCONFIRMATION, STATE, WEICHARTPAYSTATE } from "../../config/enum";
 import { TABLEENUM } from "../../data/models/model";
 import { findCount, findOnce, findOnceToSort } from "../../data/select";
 import * as path from "path";
@@ -154,7 +154,7 @@ export async function payCallback(body) {
                 updateUserInfo.isGracePeriod = STATE.否;
                 updateUserInfo.gracePeriodEndTime = 0;
                 updateUserInfo.memberState = MEMBERSTATE.正常;
-                updateUserInfo.paymentStatus = PAYMENTSTATUS.已支付;
+                // updateUserInfo.paymentStatus = PAYMENTSTATUS.已支付;
             } else {//非一笔订单 要更新会员到期时间 到 用户表
                 updateUserInfo.lifespanStartTime = oldInfo.orderCycleStart;
                 updateUserInfo.lifespanEndTime = oldInfo.orderCycleEnd;

src/biz/member/examine.ts

@@ -7,7 +7,7 @@ import { CERTIFICATETYPE, DOCUMENTTYPE, EDUCATION, INDIVIDUALMEMBERTYPE, MEMBERL
 import { ERRORENUM } from "../../config/errorEnum";
 import { addManyData } from "../../data/add";
 import { TABLEENUM } from "../../data/models/model";
-import { find, findCount, findOnce, findOnceToSort, findToPage, findToSortToPage } from "../../data/select";
+import { find, findCount, findOnce, findToSortToPage } from "../../data/select";
 import { updateOneData } from "../../data/update";
 import { generateSystemId, getMenberNum, successResult } from "../../tools/system";
 import { BizError } from "../../util/bizError";
@@ -33,17 +33,19 @@ import { sendPassNotice } from "../sms";
 export async function pendingReviewList({name, memberType, documentId, phone, mail, sheng, shi, pageNumber}) {
     /**查询条件 */
     let selectParam:any = {
-        "$or":[{ memberType:MEMBERTYPE.个人会员, userRegisterState:USERREGISTERSTATE.待审核, registerFlow:REGISTERFLOW.完成第二步 },
-            { memberType:MEMBERTYPE.个人会员, userRegisterState:USERREGISTERSTATE.驳回修改, registerFlow:REGISTERFLOW.完成第一步 },
-            { memberType:MEMBERTYPE.个人会员, userRegisterState:USERREGISTERSTATE.重新提交, registerFlow:REGISTERFLOW.完成第二步 },
-            { memberType:MEMBERTYPE.单位会员, userRegisterState:USERREGISTERSTATE.待审核, registerFlow:REGISTERFLOW.完成第三步 },
-            { memberType:MEMBERTYPE.单位会员, userRegisterState:USERREGISTERSTATE.驳回修改, registerFlow:REGISTERFLOW.完成第一步 },
-            { memberType:MEMBERTYPE.单位会员, userRegisterState:USERREGISTERSTATE.重新提交, registerFlow:REGISTERFLOW.完成第三步 }
+        "$or":[
+            {
+                userRegisterState:{"$lt":USERREGISTERSTATE.驳回修改}, 
+                registerFlow:{"$gt":REGISTERFLOW.完成第一步}
+            },
+            {
+                userRegisterState:USERREGISTERSTATE.驳回修改, 
+                registerFlow:REGISTERFLOW.完成第一步
+            }
         ],
         isAdmin:STATE.否
     }; //审批列表展示状态除通过外的数据
     if (name) {
-
         selectParam["$and"] = [
             {"$or":[
                 {unitName:{"$regex":`${name}`}},
@@ -52,9 +54,8 @@ export async function pendingReviewList({name, memberType, documentId, phone, ma
         ];
     }
     if (memberType.length) {
-        if (memberType < UNITMEMBERTYPE.院校) {
-            selectParam.individualMemberType = {"$in":memberType};
-        } else {
+        if (memberType.indexOf(MEMBERTYPE.个人会员) > -1) selectParam.memberType = MEMBERTYPE.个人会员;
+        else {//单位
             selectParam.unitMemberType = {"$in":memberType};
         }
     }

src/biz/member/homePage.ts

@@ -253,7 +253,7 @@ export async function getSheng ({userId}) {
     if (!userInfo || !userInfo.userId) throw new BizError(ERRORENUM.目标数据不存在);
 
     let certificate = false;//是否可以下载
-    let cefaInfo = {};
+    let cefaInfo:any = {};
     let msg = '会员注册尚未审核通过，无法下载证书';
     //判断是否审批通过
     if (userInfo.userRegisterState == USERREGISTERSTATE.通过) {
@@ -295,6 +295,12 @@ export async function getSheng ({userId}) {
                     session:getEdition(Math.floor(userInfo.session/100), userInfo.session%100 ),
                     lifespanTime:`${moment(userInfo.lifespanStartTime).format("YYYY年MM月DD日")}至${moment(userInfo.lifespanEndTime).format("YYYY年MM月DD日")}`
                 }
+                if (userInfo.unitMemberType == UNITMEMBERTYPE.院校) {
+                    let diffYearNum = moment().diff(moment(userInfo.lifespanStartTime), 'years');
+                    let startTimeStr = moment(userInfo.lifespanStartTime).add(diffYearNum, 'years').format("YYYY年MM月DD日");
+                    let endTimeStr = moment(userInfo.lifespanStartTime).add(diffYearNum+1, 'years').format("YYYY年MM月DD日");
+                    cefaInfo.lifespanTime = `${startTimeStr}至${endTimeStr}`;
+                }
                 msg = ``;
             } else {
                 msg = `会员注册尚未缴费，无法下载证书`;

src/biz/member/member.ts

@@ -16,6 +16,7 @@ import { deleteManyData, deleteOneData } from "../../data/delete";
 import moment = require("moment");
 import { eccCityCode, getCityNameByCode } from "../../config/cityConfig";
 import { eccFormParam } from "../../util/verificationParam";
+import { getSession } from "../public";
 
 
 /**
@@ -287,6 +288,7 @@ export async function individualMemberDetails({id}) {
 
     let topInfo:any = extractData(oldInfo, TopConfig);
     topInfo.memberLevel = changeEnumValue(MEMBERLEVEL, topInfo.memberLevel);
+    topInfo.session = getEdition(parseInt(`${topInfo.session/100}`), parseInt(`${topInfo.session%100}`) );
 
     let basicInfo:any = extractData(oldInfo, IndividualBasicConfig);
     // basicInfo.documentType = changeEnumValue(DOCUMENTTYPE, basicInfo.documentType);
@@ -303,6 +305,7 @@ export async function individualMemberDetails({id}) {
 
     let specialityInfo:any = extractData(oldInfo, SpecialityConfig);
     // basicInfo.profCategory = changeEnumValue(PROFCATEGORY, basicInfo.profCategory);
+
     
     let otherAttachment:any = extractData(oldInfo, ["cardUrlJust", "cardUrlBack", "academicCERTUrl", "professionalCERTUrl", "auxiliaryMaterial"]);
     

src/biz/member/memberFees.ts

@@ -3,7 +3,7 @@
  */
 
 import moment = require("moment");
-import { MEMBERLEVEL, MEMBERSTATE, MEMBERTYPE, ORDERSTATE, PAYMENTSTATUS, PAYMENTTYPE, RECEIPTCONFIRMATION, STATE, UNITMEMBERTYPE, USERREGISTERSTATE } from "../../config/enum";
+import { MEMBERLEVEL, MEMBERSTATE, MEMBERTYPE, ORDERSTATE, PAYMENTTYPE, RECEIPTCONFIRMATION, STATE, UNITMEMBERTYPE, USERREGISTERSTATE } from "../../config/enum";
 import { TABLEENUM } from "../../data/models/model";
 import { find, findCount, findOnce, findOnceToSort, findToPage, findToSort } from "../../data/select";
 import { extractData } from "../../util/piecemeal";

src/biz/officialWebsite.ts

@@ -3,7 +3,7 @@
  */
 
 import moment = require("moment");
-import { ARTICLEPOSITION, BANNERPOSITION, BRANCHPOSITION, CODPARTICIPANT, DANGJIANVIDEO, DONGTAIZIXUNSUBTYPE, IMGEDITFUNENUM, MEMBERSTATE, MEMBERTYPE, PARTYBUILDSUBTYPEENUM, PARTYBUILDTYPEENUM, STATE, TONGZHIGONGGAO, XUEHUILINGDAOZHIWEI } from "../config/enum";
+import { ARTICLEPOSITION, BANNERPOSITION, BRANCHPOSITION, CODPARTICIPANT, DANGJIANVIDEO, DONGTAIZIXUNSUBTYPE, IMGEDITFUNENUM, MEMBERSTATE, MEMBERTYPE, PARTYBUILDSUBTYPEENUM, PARTYBUILDTYPEENUM, STATE, TONGZHIGONGGAO, UNITMEMBERTYPE, XUEHUILINGDAOZHIWEI } from "../config/enum";
 import { TABLEENUM } from "../data/models/model";
 import { find, findCount, findOnce, findToPage, findToSort, findToSortToPage } from "../data/select";
 import { extractData } from "../util/piecemeal";
@@ -756,8 +756,15 @@ export async function zhengShuChaXun({memberType, name, carId }) {
     let selectParam = {};
     if (memberType == MEMBERTYPE.个人会员) selectParam = {name, documentId:carId};
     else selectParam = {unitName:name, uscc:carId}
-    let userInfo = await findOnce(TABLEENUM.用户表, selectParam, ["userId", "lifespanEndTime"]);
+    let userInfo = await findOnce(TABLEENUM.用户表, selectParam, ["userId", "lifespanEndTime", "lifespanStartTime", "unitMemberType"]);
     if (!userInfo || !userInfo.userId) return {success:false, msg:"无法查询到该信息，请联系学会工作人员"};
+    
+    if (userInfo.unitMemberType == UNITMEMBERTYPE.院校) {
+        let diffYearNum = moment().diff(moment(userInfo.lifespanStartTime), 'years');
+        let startTimeStr = moment(userInfo.lifespanStartTime).add(diffYearNum, 'years').format("YYYY年MM月DD日");
+        let endTimeStr = moment(userInfo.lifespanStartTime).add(diffYearNum+1, 'years').format("YYYY年MM月DD日");
+        return {success:true, msg:`证书有效期至${endTimeStr}`};
+    }
     if ( new Date().valueOf() > userInfo.lifespanEndTime ){
         return {success:true, msg:`会员到期，请续会员`};
     }