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

src/biz/member/homePage.ts

@@ -30,15 +30,15 @@ export async function getMemberData({userId}) {
     let baseSelectFiles = [];
     let majorSelectFiles = [];
     /**判断会员类型，个人会员与单位会员返回不同字段 */
-    if (oldInfo.memberType == MEMBERTYPE.个人会员) {
-        baseSelectFiles = ["name", "sex", "documentType", "documentId", "sheng", "shi", "qu", "nation", "birth", "addres"];
-        majorSelectFiles = ["workUnit", "duties", "workTitle", "studyResume", "workResume", "profAchievement", "otherEMP", "otherPROF", "profCategory"];
-    } else if (oldInfo.memberType == MEMBERTYPE.单位会员) {
+    if (oldInfo.memberType == MEMBERTYPE.单位会员) {
         baseSelectFiles = ["unitName", "uscc", "sheng", "shi", "qu", "nation", "birth", "addres", "legalPerson", "legalPersonPhone", "legalPersonMail", "unitMail", "contactPerson", "contactPersonDuties", 
         "contactPersonPhone", "uusinessLicenseUrl"];
         majorSelectFiles = ["unitMemberType", "yuanXiaoBanXueLeiXing", "yuanXiaoZhuGuanBuMen", "yuanXiaoFuZeRen", "yuanXiaoFuZeRenZhiWu", "yuanXiaoFuZeRenDianHua", 
         "yuanXiaoBanGongFuZeRen", "yuanXiaoBanGongFuZeRenDianHua", "ZhuYaoFuZeRenYouXiang", "yuanXiaoKeYanFuZeRen", "yuanXiaoKeYanFuZeRenDianHua", "jiaoXueFuZeRenXinMing", 
         "yuanXiaoXueShengZongRenShu", "yuanXiaoJiaoZhiGongZongRenShu", "jiaoXueFuZeRenDianHua"];
+    } else {
+        baseSelectFiles = ["name", "sex", "documentType", "documentId", "sheng", "shi", "qu", "nation", "birth", "addres"];
+        majorSelectFiles = ["workUnit", "duties", "workTitle", "studyResume", "workResume", "profAchievement", "otherEMP", "otherPROF", "profCategory"]; 
     }
 
     /**返回指定配置字段 */

src/biz/member/memberFees.ts

@@ -290,15 +290,20 @@ export async function getGracePeriod({unitName, joinStartTime, joinEndTime, memb
     let dataCount = await findCount(TABLEENUM.用户表, selectParam);
 
     let dataList = [];
-    const itemFiles = ["userId", "memberState", "unitName", "loginId", "phone", "joinTime", "memberType"];
+    const itemFiles = ["userId", "memberState", "loginId", "phone", "joinTime", "memberType", "unitName"];
     dbList.forEach(info => {
-        let item:any = extractData(info, itemFiles);
-        item.lifespanTime = `${moment(info.lifespanEndTime).format("YYYY-MM-DD")}`;
-        item.nextLifespanTime = "宽限期中";
-    
-        item.memberState = changeEnumValue(MEMBERSTATE, item.memberState);
-        item.memberType = changeEnumValue(MEMBERTYPE, item.memberType);
-        dataList.push(item);
+        let dataInfo = {
+            userId:info.userId,
+            memberState:changeEnumValue(MEMBERSTATE, info.memberState),
+            loginId:info.loginId,
+            phone:info.phone,
+            unitName,
+            lifespanTime:`${moment(info.lifespanEndTime).format("YYYY-MM-DD")}`,
+            nextLifespanTime:"宽限期中",
+            memberType:changeEnumValue(MEMBERTYPE, info.memberType)
+        };
+
+        dataList.push(dataInfo);
     });
 
     return {dataList, dataCount};

src/main.ts

@@ -13,7 +13,7 @@ async function lanuch() {
    
     // await smsTask();
     console.log('This indicates that the server is started successfully.');
-    await initAdmin();
+    // await initAdmin();
 }
 
 lanuch();

src/routers/member/router.ts

@@ -138,7 +138,7 @@ export const Config = {
         },
         {
             apiName:"单位入会流程3",
-            subUrl:'/memberdb/unitmemberregister2',
+            subUrl:'/memberdb/unitmemberregister3',
             param:[
                 {
                     key:"application", type:"String", desc:"入会申请表"
@@ -196,7 +196,7 @@ export const Config = {
                 {key:"joinTime", type:"Number", 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:"session", type:"String", desc:"届次", isNull:true},
                 {key:"sheng", type:"String", desc:"省", isNull:true},
                 {key:"shi", type:"String", desc:"市", isNull:true},
                 {key:"qu", type:"String", desc:"区", isNull:true},
@@ -213,7 +213,7 @@ export const Config = {
                 {key:"phone", 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:"session", type:"String", desc:"届次", isNull:true},
                 {key:"joinTime", type:"Number", desc:"入会时间", isNull:true},
                 {key:"auditTime", type:"Number", desc:"审核时间", isNull:true},
                 {key:"memberState", type:"Number", desc:"状态", isNull:true},
@@ -440,8 +440,8 @@ export const Config = {
             subUrl:'/memberfees/offlinepayment', 
             param:[
                 {key:"orderId", type:"String", desc:"订单id", isNull:true},
-                {key:"paymentNum", type:"Number", desc:"支付单号", isNull:true},
-                {key:"pageNumber", type:"Number", desc:"当前页"}
+                {key:"paymentNum", type:"String", desc:"支付单号", isNull:true},
+                {key:"offlinePaymentUrl", type:"String", desc:"转账截图"}
             ],
             bindBiz:memberFeesBiz.offlinePayment
         },

src/routers/router.ts

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