no message

src/biz/cleanData.ts

@@ -5,7 +5,7 @@
 import moment = require("moment");
 import { BANXUELEIXING, CERTIFICATETYPE, DOCUMENTTYPE, EDUCATION, INDIVIDUALMEMBERTYPE, MEMBERLEVEL, MEMBERSTATE, MEMBERTYPE, NATION, PROFCATEGORY, SEX, STATE, USERREGISTERSTATE } from "../config/enum";
 import { TABLEENUM } from "../data/models/model";
-import { find, findOnce } from "../data/select";
+import { find, findOnce, findOnceToSort } from "../data/select";
 import { updateOneData } from "../data/update";
 import { BizError } from "../util/bizError";
 import { changeEnumValue } from "../util/verificationEnum";
@@ -338,7 +338,7 @@ export async function changeDB() {
 
     for (let i = 0; i < dbList.length; i++) {
         let info = dbList[i];
-        let orderInfo = await findOnce(TABLEENUM.订单表, {userId: info.userId}, ["invoiceMail"]);
+        let orderInfo = await findOnceToSort(TABLEENUM.订单表, {userId: info.userId}, {orderCycleStart:-1}, ["invoiceMail"]);
         let subList = [ (i+1).toString() ];
         for (let i = 0; i < selectConf.length; i++) {
             let key = selectConf[i];
@@ -374,7 +374,10 @@ export async function changeDB() {
         dataList.push(subList);
     }
 
-    return {dataList};
+    // 输出个人会员库的数据到Excel文件
+    writeExcel(dataList, '数据库-个人会员.xlsx');
+    console.log('数据已输出到 数据库-个人会员.xlsx');
+    // return {dataList};
 }
 
 

src/biz/member/apply.ts

@@ -695,6 +695,9 @@ export async function infomationChangeLog({infoChangeId}) {
         throw new BizError(ERRORENUM.不存在审批历史);
     }
 
+    userInfo.yuanXiaoBanXueLeiXing = changeEnumValue(BANXUELEIXING, userInfo.yuanXiaoBanXueLeiXing);
+
+    
     let selectParam:any = {userId:userInfo.userId};
     let fileList = [];
     let dbList = await findToSort(TABLEENUM.资料变更审批历史表, selectParam, {createTimeMs:-1}, fileList);
@@ -716,6 +719,7 @@ export async function infomationChangeLog({infoChangeId}) {
             desc = "通过";
             infoChangeOptionType = "审核-通过";
         }
+        info.yuanXiaoBanXueLeiXing = changeEnumValue(BANXUELEIXING, info.yuanXiaoBanXueLeiXing);
 
         // let updateInfoStr = "修改了:";
         // if (info.unitName != userInfo.unitName) updateInfoStr += "单位名称";
@@ -773,7 +777,7 @@ export async function infomationChangeLog({infoChangeId}) {
             unitMemberType:changeEnumValue(UNITMEMBERTYPE, info.unitMemberType),
             uusinessLicenseUrl:info.uusinessLicenseUrl,
             applicationForm:info.applicationForm,
-            yuanXiaoBanXueLeiXing:info.yuanXiaoBanXueLeiXing,
+            yuanXiaoBanXueLeiXing:changeEnumValue(BANXUELEIXING, info.yuanXiaoBanXueLeiXing),
             desc,
             time:moment(info.createTimeMs).format("YYYY-MM-DD HH:mm:SS"),
             updateAddress: updateAddress.replace(/、([^、]*)$/, "$1"), //去除末尾的、

src/biz/member/blacklist.ts

@@ -3,7 +3,7 @@
  */
 
 import moment = require("moment");
-import { MEMBERLEVEL, MEMBERSTATE, MEMBERTYPE, STATE } from "../../config/enum";
+import { MEMBERLEVEL, MEMBERSTATE, MEMBERTYPE, MEMBERTYPEECCENUM, STATE } from "../../config/enum";
 import { TABLEENUM } from "../../data/models/model";
 import { findCount, findOnce, findToPage } from "../../data/select";
 import { extractData } from "../../util/piecemeal";
@@ -63,20 +63,27 @@ export async function blackList({name, joinStartTime, joinEndTime, memberType, m
     if (qu) selectParam.qu = qu;
 
     const SelectFiles = ["userId", "memberState", "loginId", "phone", "joinTime", "memberLevel", "sheng", "shi", "qu", "unitName", "name", "memberType"];
-    let dbList = await findToPage(TABLEENUM.用户表, selectParam, SelectFiles, pageNumber);
+    let dbList = await findToPage(TABLEENUM.用户表, selectParam, [], pageNumber);
     let dataCount = await findCount(TABLEENUM.用户表, selectParam);
 
-    const DataFiles = ["userId", "memberState", "loginId", "phone", "joinTime", "memberLevel", "sheng", "shi", "qu", "name", "memberType"];
+    const DataFiles = ["userId", "memberState", "unitName", "name", "loginId", "phone", "askForTime", "memberLevel", "sheng", "shi", "qu", 
+    "individualMemberType", "unitMemberType", "memberType", "mail", "documentId"];
     let dataList = [];
     dbList.forEach(info => {
         let item:any = extractData(info, DataFiles);
-        if (info.memberType == MEMBERTYPE.单位会员) {
-            item.name = info.unitName;
+        // if (info.memberType == MEMBERTYPE.单位会员) {
+        //     item.name = info.unitName;
+        // }
+        if(item.individualMemberType) {
+            item.memberType = changeEnumValue(MEMBERTYPEECCENUM, info.individualMemberType);
+        }
+        if(item.unitMemberType) {
+            item.memberType = changeEnumValue(MEMBERTYPEECCENUM, info.unitMemberType);
         }
         item.memberState = changeEnumValue(MEMBERSTATE, item.memberState);
+        // item.memberType = changeEnumValue(MEMBERTYPE, item.memberType);
         if (!item.memberLevel) item.memberLevel = "未选择";
         else item.memberLevel = changeEnumValue(MEMBERLEVEL, item.memberLevel);
-        item.memberType = changeEnumValue(MEMBERTYPE, item.memberType);
         item.joinTime = moment(item.joinTime).format("YYYY-MM-DD");
         item.sheng = getCityNameByCode(item.sheng);
         item.shi = getCityNameByCode(item.shi);

src/biz/member/examine.ts

@@ -196,7 +196,7 @@ export async function submitDocument({name, memberType, documentId, phone, mail,
     if (mail) selectParam.mail = mail;
 
     const SelectFiles = ["userId", "userRegisterState", "unitName", "name", "loginId", "phone", "askForTime", "memberLevel", 
-    "individualMemberType", "unitMemberType", "memberType", "mail", "sheng", "shi", "qu", "documentId"];
+    "individualMemberType", "unitMemberType", "memberType", "mail", "sheng", "shi", "qu", "documentId", "registerFlow"];
     let dbList = await findToSortToPage(TABLEENUM.用户表, selectParam, SelectFiles, {askForTime:-1}, pageNumber, pageSize);
     let dataCount = await findCount(TABLEENUM.用户表, selectParam);
 
@@ -204,12 +204,14 @@ export async function submitDocument({name, memberType, documentId, phone, mail,
     dbList.forEach(info => {
         let item:any = extractData(info, SelectFiles);
         /**处理枚举值 */
-        if (!item.userRegisterState) item.userRegisterState = USERREGISTERSTATE.待审核;
-        else item.userRegisterState = changeEnumValue(USERREGISTERSTATE, item.userRegisterState);
+        // if (!item.userRegisterState) item.userRegisterState = USERREGISTERSTATE.待审核;
+        // else item.userRegisterState = changeEnumValue(USERREGISTERSTATE, item.userRegisterState);
+        item.registerFlow = changeEnumValue(REGISTERFLOW, item.registerFlow);
         item.memberLevel = changeEnumValue(MEMBERLEVEL, item.memberLevel);
         item.sheng = getCityNameByCode(item.sheng);
         item.shi = getCityNameByCode(item.shi);
         item.qu = getCityNameByCode(item.qu);
+        item.documentId = documentId || "-"
         if(item.individualMemberType) {
             item.memberType = changeEnumValue(MEMBERTYPEECCENUM, info.individualMemberType);
         } else {

src/biz/member/finance/costVerification.ts

@@ -256,7 +256,7 @@ export async function confirmReceiptOut({id, isReceive, returnsReasons}) {
 
 
 /**
- * 发票管理-财务核对页-数据导出
+ * 发票管理-财务费用核对页-数据导出
  * @param param0 
  */
 export async function outPutConfirmReceipt({exportColumns, payType, examineState}) {
@@ -294,12 +294,17 @@ export async function outPutConfirmReceipt({exportColumns, payType, examineState
     let dataList = [selectTitle];
     for (let i = 0; i < dbList.length; i++) {
         let info = dbList[i];
-        let userInfo = await findOnce(TABLEENUM.用户表, {userId:info.userId}, ["memberState", "name", "session", "unitName", "documentId", "uscc", "mail", "memberLevel",  "phone"]);
+        let userInfo = await findOnce(TABLEENUM.用户表, {userId:info.userId}, ["memberState", "name", "session", "unitName", "documentId", "uscc", "mail", "memberLevel",  "phone", "individualMemberType", "unitMemberType"]);
         let orderInfo = await findOnceToSort(TABLEENUM.订单审批历史表, {orderId:info.id,operationBehavior:ORDEREXAMINE.用户提交, refundName:null}, {operationTime:-1}, ["operationTime"]);
         let subList = [ (i+1).toString() ];
         for (let i = 0; i < selectConf.length; i++) {
             let key = selectConf[i];
             let value = info[key] || "";
+            
+            if (key == "memberCategory") {
+                if (info.memberCategory == MEMBERTYPE.个人会员) value = changeEnumValue(MEMBERTYPEECCENUM, userInfo.individualMemberType);
+                else if (info.memberCategory == MEMBERTYPE.单位会员) value = changeEnumValue(MEMBERTYPEECCENUM, userInfo.unitMemberType);
+            }
             if (key == "name") {
                 if (info.memberCategory == MEMBERTYPE.个人会员) value = userInfo.name;
                 else if (info.memberCategory == MEMBERTYPE.单位会员) value = userInfo.unitName;
@@ -336,7 +341,7 @@ export async function outPutConfirmReceipt({exportColumns, payType, examineState
             if (key == "orderCycle") value = `${moment(info.orderCycleStart).format("YYYY-MM-DD")}至${moment(info.orderCycleEnd).format("YYYY-MM-DD")}`;  
             if (value && value != "-") {
                 if (timeChnageList.indexOf(key) != -1) value = moment(value).format("YYYY-MM-DD");
-                else if (key == "memberCategory") value = changeEnumValue(MEMBERTYPE, value);
+                // else if (key == "memberCategory") value = changeEnumValue(MEMBERTYPE, value);
                 // else if (key == "memberLevel") value = changeEnumValue(MEMBERLEVEL, value);
                 else if (key == "paymentMethod") value = changeEnumValue(PAYMENTTYPE, value);
                 else if (key == "invoiceStatus") value = changeEnumValue(INVOICESTATUS, value);

src/biz/member/finance/invoice.ts

@@ -153,14 +153,16 @@ export async function billStateList({name, memberType, documentId, invoiceApplyM
         else if (info.confirmReceipt != RECEIPTCONFIRMATION.收款确认 && info.state == ORDERSTATE.已支付) itemData.isPay = "核对中"; //费用核对里待审批和驳回列表里的数据都会显示核对中
         // else if (info.refundSuccessful) itemData.isPay = "已退回";
         else itemData.isPay = "未支付";
-        let userInfomation = await findOnce(TABLEENUM.用户表, {userId:itemData.userId}, ["userId", "memberState", "name", "memberLevel", "individualMemberType", "unitMemberType"]);
+        let userInfomation = await findOnce(TABLEENUM.用户表, {userId:itemData.userId}, ["userId", "memberState", "name", "memberLevel", "memberType", "mail", "individualMemberType", "unitMemberType"]);
         if (!userInfomation || !userInfomation.userId) continue;
         if(userInfomation) {
-            if(userInfomation.individualMemberType) {
+            if(userInfomation.memberType == MEMBERTYPE.个人会员) {
                 itemData.memberType = changeEnumValue(MEMBERTYPEECCENUM, userInfomation.individualMemberType);
+                itemData.invoiceMail = userInfomation.mail;
             }
-            if(userInfomation.unitMemberType) {
+            if(userInfomation.memberType == MEMBERTYPE.单位会员) {
                 itemData.memberType = changeEnumValue(MEMBERTYPEECCENUM, userInfomation.unitMemberType);
+                itemData.invoiceMail = itemData.invoiceMail;
             }
             itemData.memberLevel = changeEnumValue(MEMBERLEVEL, userInfomation.memberLevel);
             // itemData.memberState = changeEnumValue(MEMBERSTATE, userInfomation.memberState);
@@ -346,12 +348,17 @@ export async function backInvoice({id}) {
     let dataList = [selectTitle];
     for (let i = 0; i < dbList.length; i++) {
         let info = dbList[i];
-        let userInfo = await findOnce(TABLEENUM.用户表, {userId:info.userId}, ["memberState", "name", "unitName", "documentId", "uscc", "mail", "memberLevel", "phone"]);
+        let userInfo = await findOnce(TABLEENUM.用户表, {userId:info.userId}, ["memberState", "name", "unitName", "documentId", "uscc", "mail", "memberLevel", "phone", "individualMemberType", "unitMemberType"]);
         let orderInfo = await findOnceToSort(TABLEENUM.订单审批历史表, {orderId:info.id,operationBehavior:ORDEREXAMINE.用户提交, refundName:null}, {operationTime:-1}, ["operationTime"]);
         let subList = [ (i+1).toString() ];
         for (let i = 0; i < selectConf.length; i++) {
             let key = selectConf[i];
             let value = info[key] || "";
+            
+            if (key == "memberCategory") {
+                if (info.memberCategory == MEMBERTYPE.个人会员) value = changeEnumValue(MEMBERTYPEECCENUM, userInfo.individualMemberType);
+                else if (info.memberCategory == MEMBERTYPE.单位会员) value = changeEnumValue(MEMBERTYPEECCENUM, userInfo.unitMemberType);
+            }
             if (key == "name") {
                 if (info.memberCategory == MEMBERTYPE.个人会员) value = userInfo.name;
                 else if (info.memberCategory == MEMBERTYPE.单位会员) value = userInfo.unitName;
@@ -388,7 +395,7 @@ export async function backInvoice({id}) {
             // }
             if (value && value != "-") {
                 if (timeChnageList.indexOf(key) != -1) value = moment(value).format("YYYY-MM-DD");
-                else if (key == "memberCategory") value = changeEnumValue(MEMBERTYPE, value);
+                // else if (key == "memberCategory") value = changeEnumValue(MEMBERTYPE, value);
                 // else if (key == "memberLevel") value = changeEnumValue(MEMBERLEVEL, value);
                 else if (key == "paymentMethod") value = changeEnumValue(PAYMENTTYPE, value);
             }
@@ -551,13 +558,15 @@ export async function invoicedList({name, memberType, documentId, invoiceExamine
         // itemData.cycle = `${moment(info.orderCycleStart).format("YYYY-MM-DD")}至${moment(info.orderCycleEnd).format("YYYY-MM-DD")}`;
         itemData.cycle = `${moment(info.orderCycleStart).format("YYYY")}至${moment(info.orderCycleEnd).format("YYYY")}`;
         itemData.isPay = changeEnumValue(ORDERSTATE, itemData.state);
-        let userInfo = await findOnce(TABLEENUM.用户表, {userId:itemData.userId}, ["userId", "memberState", "name", "memberLevel", "individualMemberType", "unitMemberType"])
+        let userInfo = await findOnce(TABLEENUM.用户表, {userId:itemData.userId}, ["userId", "memberState", "name", "memberLevel", "memberType", "individualMemberType", "unitMemberType", "mail"])
         if(userInfo) {
-            if(userInfo.individualMemberType) {
+            if(userInfo.memberType == MEMBERTYPE.个人会员) {
                 itemData.memberType = changeEnumValue(MEMBERTYPEECCENUM, userInfo.individualMemberType);
+                itemData.invoiceMail = userInfo.mail;
             }
-            if(userInfo.unitMemberType) {
+            if(userInfo.memberType == MEMBERTYPE.单位会员) {
                 itemData.memberType = changeEnumValue(MEMBERTYPEECCENUM, userInfo.unitMemberType);
+                itemData.invoiceMail = info.invoiceMail ? info.invoiceMail : '-';
             }
             itemData.memberLevel = changeEnumValue(MEMBERLEVEL, userInfo.memberLevel);
         }
@@ -565,7 +574,7 @@ export async function invoicedList({name, memberType, documentId, invoiceExamine
         itemData.name = userInfo.name;
 
         itemData.invoiceExamineTime = info.invoiceExamineTime ? moment(info.invoiceExamineTime).format("YYYY-MM-DD") : '-';
-        itemData.invoiceMail = info.invoiceMail ? info.invoiceMail : '-';
+        
         dataList.push(itemData);
     }
 

src/biz/member/homePage.ts

@@ -376,17 +376,28 @@ export async function getCertificateType({userId}) {
 
 /**
  * 获取可下载缴费通知年份列表
+ * 当前年超过3月1日则返回2023年至当前年份列表，否则不包括当前年份
  * @returns 
  */
 export async function getYearList() {
-    let existingYears = [2023, 2024]; //年份列表
-    const today = moment();
-    const currentYear = today.year();
-    const marchFirst = moment().month(2).date(1); // 3月1日
-  
-    //如果today等于或者晚于3月1日，返回true 并且 年份列表不存在当前年份
-    if (today.isSameOrAfter(marchFirst) && !existingYears.includes(currentYear)) {
-        return [...existingYears, currentYear].sort((a, b) => a - b);
+    const currentDate = new Date();
+    const currentYear = currentDate.getFullYear();
+    const currentMonth = currentDate.getMonth() + 1; // JavaScript 月份从 0 开始，需加 1
+    const currentDay = currentDate.getDate();
+
+    let endYear;
+    if (currentMonth > 3 || (currentMonth === 3 && currentDay >= 1)) {
+        endYear = currentYear;
+    } else {
+        endYear = currentYear - 1;
+    }
+  
+    let existingYears = []; //年份列表
+    // 生成年份数组
+    if (endYear >= 2023) {
+        for (let i = 2023; i <= endYear; i++) {
+            existingYears.push(i);
+        }
     }
   
     return existingYears;

src/biz/member/memberFees.ts

@@ -210,7 +210,7 @@ export async function getPaid({name, memberType, documentId, phone, mail, joinSt
     if (memberLevel.length) selectParam.memberLevel = {"$in":memberLevel};
     if (session) selectParam.session = session;
 
-    const SelectFiles = ["userId", "memberState", "unitName", "name", "joinTime", "memberLevel", "individualMemberType", "unitMemberType", 
+    const SelectFiles = ["userId", "memberState", "unitName", "name", "joinTime", "memberLevel", "individualMemberType", "memberType", "unitMemberType", 
     "lifespanStartTime", "lifespanEndTime", "session"];
     let dbList = await findToSortToPage(TABLEENUM.用户表, selectParam, SelectFiles, {joinTime:-1}, pageNumber);
     let dataCount = await findCount(TABLEENUM.用户表, selectParam);
@@ -226,10 +226,10 @@ export async function getPaid({name, memberType, documentId, phone, mail, joinSt
         item.joinTime = moment(item.joinTime).format("YYYY-MM-DD");
         item.memberState = changeEnumValue(MEMBERSTATE, item.memberState);
         item.memberLevel = changeEnumValue(MEMBERLEVEL, item.memberLevel);
-        if(info.individualMemberType) {
+        if(info.memberType == MEMBERTYPE.个人会员) {
             item.memberType = changeEnumValue(MEMBERTYPEECCENUM, info.individualMemberType);
         }
-        if(info.unitMemberType) {
+        if(info.memberType == MEMBERTYPE.单位会员) {
             item.memberType = changeEnumValue(MEMBERTYPEECCENUM, info.unitMemberType);
         }
 

src/biz/member/order.ts

@@ -540,7 +540,7 @@ export async function accountInfo({id, form}) {
 
 
 /**
- * 退款列表
+ * 退款列表 驳回列表
  * @param param0 
  */
 export async function refundList({name, memberType, joinStartTime, joinEndTime, isReceiveMoney, pageNumber}) {
@@ -651,9 +651,9 @@ export async function refundList({name, memberType, joinStartTime, joinEndTime,
 
         // let operationBehavior = "";
         //订单分类字段【需退款、无需退款】
-        if (historyList && historyList.isReceiveMoney) itemData.operationBehavior = "不需退款";
+        if (historyList && !historyList.isReceiveMoney) itemData.operationBehavior = "需退款";
         // if (isReceiveMoney == ISRECEIVEMONEY.不需退款) itemData.operationBehavior = "不需退款";
-        else itemData.operationBehavior = "需退款";
+        else itemData.operationBehavior = "不需退款";
 
         dataList.push(itemData);
     }

src/main.ts

@@ -30,7 +30,7 @@ async function lanuch() {
     // console.log(moment(1498262400000).format("YYYY-MM-DD HH:mm:SS"))
     console.log("服务初始化成功");
     // await sendMail("18711017326@163.com");
-    // await testCallback("e793d4b37c2eac2de13b4df69fa2cc18")
+    // await testCallback("cb3d2c437b64cd10f55d892b8d0fe413")
     // await getUnitData();
     // await changeDB();
     // await getData();