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

src/biz/member/member.ts

@@ -190,7 +190,8 @@ export async function individualMemberList({name, documentId, phone, individualM
  * @returns {顶部数据, 基本信息, 专业信息, 其他附件}
  */
 
-const IndividualBasicConfig = ["name", "sex", "nation", "birth", "documentType", "documentId", "sheng", "shi", "qu", "addres", "photoUrl", "uscc", "unitName"];
+const IndividualBasicConfig = ["name", "sex", "nation", "birth", "documentType", "documentId", "sheng", "shi", "qu", "addres", "photoUrl", "uscc", 
+"unitName", "education", "uscc", "unitName"];
 const SpecialityConfig = ["workUnit", "duties", "workTitle", "profCategory", "studyResume", "workResume", "profAchievement", "otherEMP", "otherPROF"];
 
 export async function individualMemberDetails({id}) {
@@ -203,6 +204,7 @@ export async function individualMemberDetails({id}) {
     let basicInfo:any = extractData(oldInfo, IndividualBasicConfig);
     basicInfo.documentType = changeEnumValue(DOCUMENTTYPE, basicInfo.documentType);
     basicInfo.nation = changeEnumValue(NATION, basicInfo.nation);
+    /**获取订单表新社会信用代码和新发票抬头 */
     let orderInfo = await findOnce(TABLEENUM.订单表, {userId:id});
     if (!orderInfo || !orderInfo.userId) throw new BizError(ERRORENUM.目标数据不存在);
     basicInfo.newUscc = orderInfo.newUscc;

src/biz/member/memberFees.ts

@@ -49,7 +49,7 @@ export async function getPaid({unitName, joinStartTime, joinEndTime, memberType,
         let item:any = extractData(info, itemFiles);
         item.lifespanTime = `${moment(info.lifespanStartTime).format("YYYY-MM-DD")} 至 ${moment(info.lifespanEndTime).format("YYYY-MM-DD")}`;
         item.nextLifespanTime = "大于90天";
-        item.joinTime = moment(info.joinTime).format("YYYY-MM-DD");
+        item.joinTime = moment(item.joinTime).format("YYYY-MM-DD");
         item.memberState = changeEnumValue(MEMBERSTATE, item.memberState);
         item.memberType = changeEnumValue(MEMBERTYPE, item.memberType);
         dataList.push(item);
@@ -90,12 +90,9 @@ export async function paidOrderList({id}) {
  */
 export async function unpaidList({unitName, joinStartTime, joinEndTime, memberType, pageNumber}) {
     const NowMs = new Date().valueOf();
-    /**到期时间距离今天大于90天 */
+    /**到期时间距离今天小于90天 */
     let selectParam:any = {
-        "$and":[
-            { "lifespanEndTime":{"$lt":NowMs + (30 * 24 * 3600 * 1000)}},
-            { "lifespanEndTime":{"$gt":NowMs}}
-        ],
+        lifespanEndTime:{"$lt":NowMs + (90 * 24 * 3600 * 1000)},
         isAdmin:STATE.否,
         isGracePeriod:STATE.否
     }

src/biz/member/order.ts

@@ -178,7 +178,7 @@ export async function paidList({unitName, paymentType, costType, pageNumber }) {
     if (paymentType) findParam.paymentMethod = paymentType;
     if (costType) findParam.isFirst = costType == COSTTYPE.首次;
 
-    let selectFile = ["id", "unitName", "orderCycleStart", "orderCycleEnd", "money", "paymentMethod", "memberCategory", "isFirst", "paymentNum" ];
+    let selectFile = ["id", "unitName", "orderCycleStart", "orderCycleEnd", "money", "paymentMethod", "memberCategory", "isFirst", "paymentNum", "memberState" ];
     let dbList = await findToPage(TABLEENUM.订单表, findParam, selectFile, pageNumber);
     let dataCount = await findCount(TABLEENUM.订单表, findParam);
 
@@ -187,11 +187,18 @@ export async function paidList({unitName, paymentType, costType, pageNumber }) {
     let itemFile = ["unitName", "money", "paymentNum"];
     dbList.forEach(info =>  {
         let itemData:any = extractData(info, itemFile);
+        itemData.memberState = changeEnumValue(MEMBERSTATE, info.memberState);
         itemData.joinTime = moment(info.orderCycleStart).format("YYYY-MM-DD");
-        itemData.memberType = changeEnumValue(MEMBERTYPE, itemData.memberCategory);
-        itemData.paymentMethod = changeEnumValue(MEMBERTYPE, itemData.paymentMethod);
+        itemData.memberType = changeEnumValue(MEMBERTYPE, info.memberCategory);
+        itemData.paymentMethod = changeEnumValue(PAYMENTTYPE, info.paymentMethod);
         itemData.costType = info.isFirst == COSTTYPE.首次 ? "首次" : "续费";
         itemData.cycle = `${moment(info.orderCycleStart).format("YYYY-MM-DD")}至${moment(info.orderCycleEnd).format("YYYY-MM-DD")}`
+
+        if (!info.paymentMethod) {
+            itemData.paymentMethod = "-";
+            itemData.paymentNum = "-";
+        }
+
         dataList.push(itemData);
     });
 

src/routers/member/router.ts

@@ -49,7 +49,7 @@ export const Config = {
                         addres:{type:'String', desc:'通信地址'},
                         education:{type:'Number', desc:'学历'},
                         photoUrl:{type:'String', desc:'蓝底证件照'},
-                        workUnit:{type:'String', desc:'工作单位'},
+                        unitName:{type:'String', desc:'工作单位'},
                         duties:{type:'String', desc:'职务'},
                         workTitle:{type:'String', desc:'职称'},
                         profCategory:{type:'Number', desc:'专业类别'},