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

src/biz/member/member.ts

@@ -2,10 +2,10 @@
  * 会员管理逻辑
  */
 
-import { MEMBERSTATE, MEMBERLEVEL, DOCUMENTTYPE, NATION, PROFCATEGORY, MEMBERTYPE, USERREGISTERSTATE, STATE, UNITMEMBERTYPE, ADMINLV, ADMINTYPE, SEX, CERTIFICATETYPE, INDIVIDUALMEMBERTYPE, EDUCATION } from "../../config/enum";
+import { MEMBERSTATE, MEMBERLEVEL, DOCUMENTTYPE, NATION, PROFCATEGORY, MEMBERTYPE, USERREGISTERSTATE, STATE, ADMINLV, ADMINTYPE, SEX, CERTIFICATETYPE, INDIVIDUALMEMBERTYPE, EDUCATION, UNITMEMBERTYPE, CLIENTMEMBERTYPE, BANXUELEIXING } from "../../config/enum";
 import { ERRORENUM } from "../../config/errorEnum";
 import { TABLEENUM } from "../../data/models/model";
-import { find, findCount, findOnce, findOnceToSort, findToPage } from "../../data/select";
+import { find, findCount, findOnce, findOnceToSort, findToPage, findToSortToPage } from "../../data/select";
 import { updateOneData } from "../../data/update";
 import { generateSystemId, getEdition, successResult } from "../../tools/system";
 import { BizError } from "../../util/bizError";
@@ -57,9 +57,8 @@ export async function unitMemberList({unitName, mail, phone, joinStartTime, join
     if (shi) selectParam.shi = shi;
     if (lableId && lableId.length) selectParam.lableId = {"$in":lableId};
     
-
-    const SelectFiles = ["userId", "memberState", "unitName", "loginId", "phone", "joinTime", "unitMemberLevel", "sheng", "shi", "qu", "lableId"];
-    let dbList = await findToPage(TABLEENUM.用户表, selectParam, SelectFiles, pageNumber);
+    const SelectFiles = ["userId", "memberState", "unitMemberType", "unitName", "contactPerson", "phone", "unitMail", "sheng", "joinTime", "memberLevel", "lableId"];
+    let dbList = await findToSortToPage(TABLEENUM.用户表, selectParam, SelectFiles, {joinTime:-1}, pageNumber);
     let dataCount = await findCount(TABLEENUM.用户表, selectParam);
 
     let dataList = [];
@@ -68,12 +67,11 @@ export async function unitMemberList({unitName, mail, phone, joinStartTime, join
         let info = dbList[i];
         let item:any = extractData(info, SelectFiles);
         item.memberState = changeEnumValue(MEMBERSTATE, item.memberState);
+        item.unitMemberType = changeEnumValue(UNITMEMBERTYPE, item.unitMemberType);
         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);
         item.lableId = [];
         let lableInfo = await find(TABLEENUM.标签表, {lableId:{"$in":info.lableId}}, ["lableName"]);
         lableInfo.forEach ( lableItem => {
@@ -220,7 +218,8 @@ export async function delResearch({id}) {
  * @param mail 个人邮箱
  * @param joinStartTime 入会开始时间
  * @param joinEndTime 入会结束时间
- * @param memberLevel 会员级别/职务 多选
+ * @param individualMemberType 个人会员类型（会员级别）
+ * @param memberLevel 会员职务 多选
  * 会员级别/职务：【普通会员、理事会员、常务理事会员】
  * @param session 届次 
  * @param profCategory 专业 PROFCATEGORY
@@ -228,7 +227,7 @@ export async function delResearch({id}) {
  * @param sheng 省
  * @param shi 市
  */
-export async function individualMemberList({name, documentId, phone, mail, joinStartTime, joinEndTime, memberLevel, session, profCategory, memberState, sheng, shi, lableId, pageNumber}) {
+export async function individualMemberList({name, documentId, phone, mail, joinStartTime, joinEndTime, individualMemberType, memberLevel, session, profCategory, memberState, sheng, shi, lableId, pageNumber}) {
     let selectParam:any = {
         memberType : MEMBERTYPE.个人会员,
         userRegisterState : USERREGISTERSTATE.通过,
@@ -245,6 +244,7 @@ export async function individualMemberList({name, documentId, phone, mail, joinS
         if (!selectParam["joinTime"]) selectParam["joinTime"] = {};
         selectParam["joinTime"]["$lt"] = joinEndTime;
     }
+    if (individualMemberType && individualMemberType.length) selectParam.individualMemberType = {"$in":individualMemberType};
     if (memberLevel && memberLevel.length) selectParam.memberLevel = {"$in":memberLevel};
     if (session) selectParam.session = session;
     if (profCategory && profCategory.length) selectParam.profCategory = {"$in":profCategory};
@@ -254,8 +254,8 @@ export async function individualMemberList({name, documentId, phone, mail, joinS
     if (lableId && lableId.length) selectParam.lableId = {"$in":lableId};
    
 
-    let selectConf = ["userId", "memberState", "unitName", "name", "sex", "nation", "loginId", "phone", "joinTime", "memberLevel", "sheng", "shi", "qu", "lableId"];
-    let dbList = await findToPage(TABLEENUM.用户表, selectParam, selectConf, pageNumber);
+    let selectConf = ["userId", "memberState", "unitName", "name", "sex", "documentId", "phone", "individualMemberType", "memberLevel", "joinTime", "lableId"];
+    let dbList = await findToSortToPage(TABLEENUM.用户表, selectParam, selectConf, {joinTime:-1}, pageNumber);
     let dataCount = await findCount(TABLEENUM.用户表, selectParam);
 
     let dataList = [];
@@ -264,12 +264,11 @@ export async function individualMemberList({name, documentId, phone, mail, joinS
         let info = dbList[i];
         let item:any = extractData(info, selectConf);
         item.memberState = changeEnumValue(MEMBERSTATE, item.memberState);
+        item.sex = changeEnumValue(SEX, item.sex);
         if (!item.memberLevel) item.memberLevel = "未选择";
         else item.memberLevel = changeEnumValue(MEMBERLEVEL, item.memberLevel)
+        item.individualMemberType = changeEnumValue(CLIENTMEMBERTYPE, item.individualMemberType);
         item.joinTime = moment(item.joinTime).format("YYYY-MM-DD")
-        item.shi = getCityNameByCode(item.shi);
-        item.sheng = getCityNameByCode(item.sheng);
-        item.qu = getCityNameByCode(item.qu);
         
         item.lableId = [];
         let lableInfo = await find(TABLEENUM.标签表, {lableId:{"$in":info.lableId}}, ["lableName"]);
@@ -472,8 +471,8 @@ export async function outPutUnitMembers({exportColumns}) {
         }
     })
     let dbList = await find(TABLEENUM.用户表, selectParam, selectConf);
-
     let timeChnageList = ["joinTime"];
+    let addList = ["sheng", "shi", "qu"];
 
     let dataList = [selectTitle];
 
@@ -490,6 +489,8 @@ export async function outPutUnitMembers({exportColumns}) {
                 else if (key == "certificateType") value = changeEnumValue(CERTIFICATETYPE, value);
                 else if (key == "individualMemberType") value = changeEnumValue(INDIVIDUALMEMBERTYPE, value);
                 else if (key == "memberLevel") value = changeEnumValue(MEMBERLEVEL, value);
+                else if (key == "yuanXiaoBanXueLeiXing") value = changeEnumValue(BANXUELEIXING, value);
+                else if (addList.indexOf(key) != -1) value = getCityNameByCode(value);
                 else if (key == "lableId") {
                     value = [];
                     let lableInfo = await find(TABLEENUM.标签表, {lableId:{"$in":info.lableId}}, ["lableName"]);

src/config/enum.ts

@@ -361,6 +361,16 @@ export enum INDIVIDUALMEMBERTYPE {
 }
 
 
+/** 
+ * 管理后台个人会员页
+ * 会员级别：普通会员需要展示成个人会员，与职务里面的普通会员做个区分
+*/
+export enum CLIENTMEMBERTYPE {
+    个人会员 = 1,
+    专家会员,
+}
+
+
 /**
  * 会员类型 校验用
  */

src/config/outPutConfig.ts

@@ -4,6 +4,7 @@
  * 待审核导出列-单位会员
  */
 export enum UNITAUDITINGCOLUMNS {
+    入会时间 = "joinTime",
     单位名称 = "unitName",
     法人邮箱 = "legalPersonMail",
     主要负责人 = "yuanXiaoFuZeRen",
@@ -47,6 +48,7 @@ export enum UNITAUDITINGCOLUMNS {
  * 待审核导出列-个人会员
  */
 export enum AUDITINGCOLUMNS {
+    入会时间 = "joinTime",
     姓名 = "name",
     手机号码 = "phone",
     专业类别 = "profCategory",

src/main.ts

@@ -22,7 +22,7 @@ async function lanuch() {
     await initAdmin();
     await initSystemTask();
     await initActivity();
-    await initSaveUnsubmitted();
+    // await initSaveUnsubmitted();
 
     // await test1();
     // await inputData();  20240520日导入数据

src/routers/member/router.ts

@@ -373,7 +373,8 @@ export const Config = {
                 {key:"mail", type:"String", desc:"个人邮箱", isNull:true},
                 {key:"joinStartTime", type:"Number", desc:"入会开始时间", isNull:true},
                 {key:"joinEndTime", type:"Number", desc:"入会结束时间", isNull:true},
-                {key:"memberLevel", type:"[Number]", 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:"profCategory", type:"Number", desc:"专业类别", isNull:true},
                 {key:"memberState", type:"Number", desc:"状态", isNull:true},

src/routers/public/router.ts

@@ -160,6 +160,13 @@ export const Config = {
             bindBiz:publicBiz.setEnumInterface
         },
         {
+            apiName:"个人会员会员级别", 
+            subUrl:'/clientmembertype', 
+            param:[],
+            defaultParam:enumConfig.CLIENTMEMBERTYPE,
+            bindBiz:publicBiz.setEnumInterface
+        },
+        {
             apiName:"会员职务", 
             subUrl:'/memberlevel', 
             param:[],

src/routers/router.ts

@@ -22,7 +22,7 @@ import * as asyncHandler from 'express-async-handler';
 import { payCallback } from "../biz/member/cost";
 import { checkUser } from "../middleware/user";
 
-const Look = true;//true更新文档
+const Look = false;//true更新文档
 
 export async function setRouter(httpServer){
     if (Look) {