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

src/biz/member/examine.ts

@@ -110,7 +110,7 @@ export async function adopt({id, session}) {
     let unitName = userInfo.unitName;
     let subType = userInfo.unitMemberType;
     if (userInfo.memberType == MEMBERTYPE.个人会员) {
-        updateInfo.individualMemberType = INDIVIDUALMEMBERTYPE.个人会员;
+        updateInfo.individualMemberType = INDIVIDUALMEMBERTYPE.普通会员;
         subType = userInfo.individualMemberType;
     }
 

src/biz/member/homePage.ts

@@ -252,9 +252,9 @@ export async function getSheng ({userId}) {
     if (userInfo.userRegisterState == USERREGISTERSTATE.通过) {
         if(userInfo.memberType == MEMBERTYPE.个人会员) {
             //个人会员已支付可下载
-            if (userInfo.individualMemberType == INDIVIDUALMEMBERTYPE.个人会员 && userInfo.paymentStatus != PAYMENTSTATUS.未支付) certificate = true;
+            if (userInfo.individualMemberType == INDIVIDUALMEMBERTYPE.普通会员 && userInfo.paymentStatus != PAYMENTSTATUS.未支付) certificate = true;
             //个人会员专家无需支付可下载
-            if (userInfo.individualMemberType == INDIVIDUALMEMBERTYPE.个人会员专家) certificate = true;
+            if (userInfo.individualMemberType == INDIVIDUALMEMBERTYPE.专家会员) certificate = true;
             if (certificate) {
                 cefaInfo = {
                     area:getCityNameByCode(userInfo.sheng),

src/biz/member/member.ts

@@ -34,12 +34,10 @@ export async function unitMemberList({unitName, joinTime, unitMemberType, member
     let selectParam:any = {isAdmin:STATE.否};
     if (unitName) selectParam.unitName = unitName;
     if (joinTime) selectParam.joinTime = joinTime;
-    if (unitMemberType) selectParam.unitMemberType = unitMemberType;
-    if (memberLevel) selectParam.memberLevel = memberLevel;
+    if (unitMemberType) selectParam.unitMemberType = {"$in":unitMemberType};
+    if (memberLevel) selectParam.memberLevel = {"$in":memberLevel};
     if (session) {
-        let thisYear = moment(session).format("YYYY");
-        let thisMonth = moment(session).format("MM");
-        selectParam.session = getEdition(thisYear, thisMonth);;
+        selectParam.session = session;
     }
     if (sheng) selectParam.sheng = sheng;
     if (shi) selectParam.shi = shi;
@@ -58,6 +56,9 @@ export async function unitMemberList({unitName, joinTime, unitMemberType, member
         if (!item.memberLevel) item.memberLevel = "未选择";
         else item.memberLevel = changeEnumValue(MEMBERLEVEL, item.memberLevel);
         item.joinTime = moment(item.joinTime).format("YYYY-MM-DD");
+        item.sheng = getCityNameByCode(item.sheng);
+        item.shi = getCityNameByCode(item.shi);
+        item.qu = getCityNameByCode(item.qu);
         dataList.push(item);
     });
 
@@ -192,12 +193,10 @@ export async function individualMemberList({name, documentId, phone, individualM
     if (name) selectParam.name = name;
     if (documentId) selectParam.documentId = documentId;
     if (phone) selectParam.phone = phone;
-    if (individualMemberType) selectParam.individualMemberType = individualMemberType;
-    if (memberLevel) selectParam.memberLevel = memberLevel;
+    if (individualMemberType) selectParam.individualMemberType = {"$in":individualMemberType};
+    if (memberLevel) selectParam.memberLevel = {"$in":memberLevel};
     if (session) {
-        let thisYear = moment(session).format("YYYY");
-        let thisMonth = moment(session).format("MM");
-        selectParam.session = getEdition(thisYear, thisMonth);;
+        selectParam.session = session;
     }
     if (joinTime) selectParam.joinTime = joinTime;
     if (auditTime) selectParam.auditTime = auditTime;

src/biz/member/order.ts

@@ -34,18 +34,18 @@ export async function createOrder(id:string, loginId:string, phone:string, unitN
     /**计算会费 */
     let money = 0;
     if (memberType == MEMBERTYPE.个人会员) {
-        if (subType != INDIVIDUALMEMBERTYPE.个人会员专家) {
+        if (subType != INDIVIDUALMEMBERTYPE.专家会员) {
             switch (memberLv) {
                 case MEMBERLEVEL.普通会员: money = 100; break;
-                case MEMBERLEVEL.理事: money = 200; break;
-                case MEMBERLEVEL.常务理事: money = 500; break;
+                case MEMBERLEVEL.理事会员: money = 200; break;
+                case MEMBERLEVEL.常务理事会员: money = 500; break;
             }
         } else money = -1;
     } else {
         switch (memberLv) {
             case MEMBERLEVEL.普通会员: money = 1000; break;
-            case MEMBERLEVEL.理事: money = 2000; break;
-            case MEMBERLEVEL.常务理事: money = 5000; break;
+            case MEMBERLEVEL.理事会员: money = 2000; break;
+            case MEMBERLEVEL.常务理事会员: money = 5000; break;
         }
     }
     if ( money == -1) return;//专家会员不会创建订单

src/config/enum.ts

@@ -349,8 +349,8 @@ export enum UNITMEMBERTYPE {
  * 个人会员类型   Individual
  */
 export enum INDIVIDUALMEMBERTYPE {
-    个人会员 = 1,
-    个人会员专家,
+    普通会员 = 1,
+    专家会员,
 }
 
 
@@ -358,8 +358,8 @@ export enum INDIVIDUALMEMBERTYPE {
  * 会员类型 校验用
  */
 export enum MEMBERTYPEECCENUM {
-    个人会员 = 1,
-    个人会员专家,
+    普通会员 = 1,
+    专家会员,
     院校 = 9,
     机构,
     其他
@@ -371,9 +371,9 @@ export enum MEMBERTYPEECCENUM {
  */
 export enum MEMBERLEVEL {
     普通会员 = 1,
-    专家会员,
-    理事,
-    常务理事,
+    // 专家会员,
+    理事会员,
+    常务理事会员,
 }
 
 

src/routers/member/router.ts

@@ -255,9 +255,9 @@ export const Config = {
             param:[
                 {key:"unitName", type:"String", desc:"单位名称", isNull:true},
                 {key:"joinTime", type:"Number", desc:"入会时间", isNull:true},
-                {key:"unitMemberType", type:"Number", desc:"单位会员类型", isNull:true},
-                {key:"memberLevel", type:"Number", desc:"会员等级职务", isNull:true},
-                {key:"session", type:"String", desc:"届次", isNull:true},
+                {key:"unitMemberType", type:"[Number]", desc:"单位会员类型", isNull:true},
+                {key:"memberLevel", type:"[Number]", desc:"会员等级职务", isNull:true},
+                {key:"session", type:"Number", desc:"届次", isNull:true},
                 {key:"sheng", type:"String", desc:"省", isNull:true},
                 {key:"shi", type:"String", desc:"市", isNull:true},
                 {key:"qu", type:"String", desc:"区", isNull:true},
@@ -272,9 +272,9 @@ export const Config = {
                 {key:"name", type:"String", desc:"姓名", isNull:true},
                 {key:"documentId", type:"String", desc:"身份证", isNull:true},
                 {key:"phone", type:"String", desc:"手机号", isNull:true},
-                {key:"individualMemberType", type:"Number", desc:"级别、会员类型", isNull:true},
-                {key:"memberLevel", type:"Number", desc:"会员等级", isNull:true},
-                {key:"session", type:"String", desc:"届次", isNull:true},
+                {key:"individualMemberType", type:"[Number]", desc:"级别、会员类型", isNull:true},
+                {key:"memberLevel", type:"[Number]", desc:"会员等级", isNull:true},
+                {key:"session", type:"Number", desc:"届次", isNull:true},
                 {key:"joinTime", type:"Number", desc:"入会时间", isNull:true},
                 {key:"auditTime", type:"Number", desc:"审核时间", isNull:true},
                 {key:"memberState", type:"Number", desc:"状态", isNull:true},