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

src/biz/mail.ts

@@ -43,6 +43,14 @@ async function send(toMail, name, type) {
     });
 }
 
+/**
+ * 
+
+ //发送邮件
+await systemSendMail(userInfo.userId, MAILTYPE.审核期间驳回通知 );
+
+
+ */
 function getModel(name, type) {
     let str = "";
     let title = "";
@@ -67,7 +75,7 @@ function getModel(name, type) {
             str = "您的年度会费已支付成功，恭喜您成为我会会员！请登陆会员网站查看相关服务详情。";
             title = "缴费成功";
         break;
-        case MAILTYPE.会员会费到期缴费通知:
+        case MAILTYPE.会员会费到期缴费通知://这里还没做
             str = "您的会员服务已过期限，为避免您的服务受到影响，请及时登录会员网站进行缴费处理。";
             title = "会费到期";   
         break;

src/biz/member/apply.ts

@@ -3,7 +3,7 @@
  */
 
 import moment = require("moment");
-import { BANXUELEIXING, CERTIFICATETYPE, CHANGEAPPLYTYPE, CLIENTMSGLABLE, INDIVIDUALMEMBERTYPE, INFOCHANGEAPPLYTYPE, MEMBERLEVEL, MEMBERSTATE, MEMBERTYPE, STATE, UNITMEMBERTYPE } from "../../config/enum";
+import { BANXUELEIXING, CERTIFICATETYPE, CHANGEAPPLYTYPE, CLIENTMSGLABLE, INDIVIDUALMEMBERTYPE, INFOCHANGEAPPLYTYPE, MAILTYPE, MEMBERLEVEL, MEMBERSTATE, MEMBERTYPE, STATE, UNITMEMBERTYPE } from "../../config/enum";
 import { TABLEENUM } from "../../data/models/model";
 import { find, findCount, findOnce, findOnceToSort, findToPage, findToSort, findToSortToPage } from "../../data/select";
 import { extractData } from "../../util/piecemeal";
@@ -14,6 +14,7 @@ import { generateSystemId, getMenberNum, successResult } from "../../tools/syste
 import { updateOneData } from "../../data/update";
 import { setEnumInterface } from "../public";
 import { addOneData } from "../../data/add";
+import { systemSendMail } from "../mail";
 
 
 /**
@@ -141,6 +142,9 @@ export async function applyList({name, joinStartTime, joinEndTime, memberCategor
     /**添加审批历史 */
     await updateOneData(TABLEENUM.理事变更审批历史表, {applyId:userInfo.applyId}, updateInfo);
 
+    //发送邮件
+    await systemSendMail(id, MAILTYPE.变更已通过 );
+
     return successResult();
 }
 
@@ -202,6 +206,9 @@ export async function applyBatchAdopt({idList}) {
         /**添加审批历史 */
         await updateOneData(TABLEENUM.理事变更审批历史表, {applyId:userInfo.applyId}, updateInfo);
 
+        //发送邮件
+        await systemSendMail(id, MAILTYPE.变更已通过 );
+
     }
 
     return successResult();
@@ -274,6 +281,9 @@ export async function applyReject({id, remarks}) {
     
     await updateOneData(TABLEENUM.消息已读状态表, {userId:id, msgId:msgInfo.msgId}, {isRead: STATE.否});
 
+    //发送邮件
+    await systemSendMail(id, MAILTYPE.变更驳回 );
+
     return successResult();
 }
 
@@ -416,7 +426,7 @@ export async function infomationChangePass({infoChangeId}) {
     let onceData = await findOnceToSort(TABLEENUM.资料变更审批历史表, selectParam, {createTimeMs:-1},fileList);
     if (!onceData || !onceData.infoChangeId) throw new BizError(ERRORENUM.目标数据不存在);
     
-    let userInfo = await findOnce(TABLEENUM.用户表, {userId:onceData.userId}, ["infoChangeId", "infoChangeOptionType"]);
+    let userInfo = await findOnce(TABLEENUM.用户表, {userId:onceData.userId}, ["infoChangeId", "infoChangeOptionType", "userId"]);
     if (userInfo.infoChangeOptionType == INFOCHANGEAPPLYTYPE.通过) {
         throw new BizError(ERRORENUM.不可重复提交);
     }
@@ -456,6 +466,8 @@ export async function infomationChangePass({infoChangeId}) {
     };
     await updateOneData(TABLEENUM.用户表, {userId:onceData.userId}, updateInfo);
     
+    //发送邮件
+    await systemSendMail(userInfo.userId, MAILTYPE.变更已通过 );
 
     return successResult();
 }
@@ -497,6 +509,9 @@ export async function infomationChangeOut({infoChangeId, rejectRemarks}) {
     };
     await updateOneData(TABLEENUM.用户表, {userId:onceData.userId}, updateInfo);
 
+     //发送邮件
+     await systemSendMail(onceData.userId, MAILTYPE.变更驳回 );
+
     return successResult();
 }
 
@@ -602,6 +617,10 @@ export async function infomationChangeManyPass({infoChangeIdList}) {
             applicationForm:onceData.applicationForm
         };
         await updateOneData(TABLEENUM.用户表, {userId:onceData.userId}, updateInfo);
+
+        //发送邮件
+        await systemSendMail(onceData.userId, MAILTYPE.变更已通过 );
+
     }
    
 

src/biz/member/finance/costVerification.ts

@@ -3,7 +3,7 @@
  */
 
 import moment = require("moment");
-import { COSTTYPE, INVOICESTATUS, ISRECEIVE, MEMBERLEVEL, MEMBERSTATE, MEMBERTYPE, MEMBERTYPEECCENUM, ORDEREXAMINE, ORDERSTATE, PAYMENTSTATUS, PAYMENTTYPE, RECEIPTCONFIRMATION, STATE } from "../../../config/enum";
+import { COSTTYPE, INVOICESTATUS, ISRECEIVE, MAILTYPE, MEMBERLEVEL, MEMBERSTATE, MEMBERTYPE, MEMBERTYPEECCENUM, ORDEREXAMINE, ORDERSTATE, PAYMENTSTATUS, PAYMENTTYPE, RECEIPTCONFIRMATION, STATE } from "../../../config/enum";
 import { ERRORENUM } from "../../../config/errorEnum";
 import { TABLEENUM } from "../../../data/models/model";
 import { find, findCount, findOnce, findOnceToSort, findToPage, findToSortToPage } from "../../../data/select";
@@ -13,6 +13,7 @@ import { changeEnumValue, eccEnumValue } from "../../../util/verificationEnum";
 import { updateOneData } from "../../../data/update";
 import { addOneData } from "../../../data/add";
 import { getEdition, successResult } from "../../../tools/system";
+import { systemSendMail } from "../../mail";
 
 
 /**
@@ -205,6 +206,9 @@ export async function confirmReceiptPass({id}) {
     };
     await addOneData(TABLEENUM.订单审批历史表, addLogInfo );
     
+     //发送邮件
+    await systemSendMail(orderInfo.userId, MAILTYPE.会员缴费成功后针对线下汇款财务审核通过的时候发送 );
+
     return successResult();
 }
 
@@ -238,6 +242,14 @@ export async function confirmReceiptOut({id, isReceive, returnsReasons}) {
     };
     await addOneData(TABLEENUM.订单审批历史表, addLogInfo );
 
+    if (isReceive == ISRECEIVE.提供账户_zkh需退款_ykh){
+        //发送邮件
+        await systemSendMail(orderInfo.userId, MAILTYPE.会员缴费财务驳回需退款 );
+    } else {
+        await systemSendMail(orderInfo.userId, MAILTYPE.会员缴费财务驳回无需退款 );
+    }
+
+
     return successResult();
 }
 

src/biz/member/finance/invoice.ts

@@ -4,9 +4,9 @@
  */
 
 import moment = require("moment");
-import { INVOICESTATUS, ISPAYENUM, MEMBERLEVEL, MEMBERSTATE, MEMBERTYPE, MEMBERTYPEECCENUM, ORDEREXAMINE, ORDERSTATE, PAYMENTTYPE, RECEIPTCONFIRMATION } from "../../../config/enum";
+import { INVOICESTATUS, ISPAYENUM, MAILTYPE, MEMBERLEVEL, MEMBERSTATE, MEMBERTYPE, MEMBERTYPEECCENUM, ORDEREXAMINE, ORDERSTATE, PAYMENTTYPE, RECEIPTCONFIRMATION, STATE } from "../../../config/enum";
 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 { extractData } from "../../../util/piecemeal";
 import { changeEnumValue, eccEnumValue } from "../../../util/verificationEnum";
 import { ERRORENUM } from "../../../config/errorEnum";
@@ -14,6 +14,7 @@ import { BizError } from "../../../util/bizError";
 import { updateOneData } from "../../../data/update";
 import { addOneData } from "../../../data/add";
 import { successResult } from "../../../tools/system";
+import { systemSendMail } from "../../mail";
 
 
 /**
@@ -129,8 +130,8 @@ export async function billStateList({name, memberType, documentId, invoiceApplyM
     }
     if (weChartPR) findParam.paymentNum = {"$regex":`${weChartPR}`};
 
-    let selectFile = ["id", "unitName", "orderCycleStart", "orderCycleEnd", "money", "paymentMethod", "memberCategory", "state", "paymentNum", "userId", "desc", "invoiceMail", "weChartCreatePayMs", "invoiceStatus"];
-    let dbList = await findToPage(TABLEENUM.订单表, findParam, selectFile, pageNumber, pageSize);
+    let selectFile = ["id", "unitName", "orderCycleStart", "orderCycleEnd", "money", "payTime", "invoiceTime", "paymentMethod", "memberCategory", "state", "paymentNum", "userId", "desc", "invoiceMail", "weChartCreatePayMs", "invoiceStatus"];
+    let dbList = await findToSortToPage(TABLEENUM.订单表, findParam, selectFile, {payTime:-1, confirmReceiptMs:-1},pageNumber, pageSize);
     let dataCount = await findCount(TABLEENUM.订单表, findParam);
 
     let dataList = [];
@@ -139,8 +140,8 @@ export async function billStateList({name, memberType, documentId, invoiceApplyM
     for (let i= 0; i < dbList.length; i++) {
         let info = dbList[i];
         let itemData:any = extractData(info, itemFile);
-        if (!itemData.desc) itemData.desc = "";
-        if (!itemData.invoiceMail) itemData.invoiceMail = "";
+        if (!itemData.desc) itemData.desc = "-";
+        if (!itemData.invoiceMail) itemData.invoiceMail = "-";
         itemData.joinTime = moment(info.orderCycleStart).format("YYYY-MM-DD");
         itemData.memberType = changeEnumValue(MEMBERTYPE, itemData.memberCategory);
         itemData.paymentMethod = changeEnumValue(PAYMENTTYPE, itemData.paymentMethod);
@@ -168,10 +169,15 @@ export async function billStateList({name, memberType, documentId, invoiceApplyM
         itemData.name = userInfomation.name;
 
         //发票申请时间
-        let orderInfo = await findOnceToSort(TABLEENUM.订单审批历史表, {orderId:info.id,operationBehavior:ORDEREXAMINE.用户提交, refundName:null}, {operationTime:-1}, ["operationTime"]);
-        if (orderInfo && orderInfo.operationTime) itemData.invoiceTime = moment(orderInfo.operationTime).format("YYYY-MM-DD");
-        else itemData.invoiceTime = "-"
+        if (info.memberCategory == MEMBERTYPE.个人会员) itemData.invoiceTime = "-";
+        else {
+            itemData.invoiceTime = info.invoiceTime ? moment(info.invoiceTime).format("YYYY-MM-DD") : "-";
+            // let orderInfo = await findOnceToSort(TABLEENUM.订单审批历史表, {orderId:info.id,operationBehavior:ORDEREXAMINE.用户提交, refundName:null}, {operationTime:-1}, ["operationTime"]);
+            // if (orderInfo && orderInfo.operationTime) itemData.invoiceTime = moment(orderInfo.operationTime).format("YYYY-MM-DD");
+            // else itemData.invoiceTime = "-";
+        }
         dataList.push(itemData);
+       
     }
 
     console.log("请求耗时", new Date().valueOf() - testMs);
@@ -230,6 +236,12 @@ export async function upInvoice({id, invoiceUrl}) {
     };
     await addOneData(TABLEENUM.订单审批历史表, addLogInfo );
 
+    if(orderInfo.state == STATE.否) {
+        //提前开票 发送邮件
+        await systemSendMail(orderInfo.userId, MAILTYPE.会员催缴通知提前开发票 );
+    }
+   
+
     return successResult();
 }
 

src/biz/member/msgActivity.ts

@@ -3,7 +3,7 @@
  */
 
 import moment = require("moment");
-import { ACTIVITYSTATE, ACTIVITYTYPE, CLIENTACTIVITYLABLE, CLIENTACTIVITYSTATE, CLIENTMSGLABLE, MEMBERLEVEL, MEMBERTYPE, STATE } from "../../config/enum";
+import { ACTIVITYSTATE, ACTIVITYTYPE, CLIENTACTIVITYLABLE, CLIENTACTIVITYSTATE, CLIENTMSGLABLE, MAILTYPE, MEMBERLEVEL, MEMBERTYPE, STATE } from "../../config/enum";
 import { ERRORENUM } from "../../config/errorEnum";
 import { addManyData, addOneData } from "../../data/add";
 import { TABLEENUM } from "../../data/models/model";
@@ -15,6 +15,7 @@ import { changeEnumValue } from "../../util/verificationEnum";
 import { updateManyData, updateOneData } from "../../data/update";
 import { eccCityCode } from "../../config/cityConfig";
 import { deleteOneData } from "../../data/delete";
+import { systemSendMail } from "../mail";
 
 
 /**
@@ -429,9 +430,14 @@ export async function addActivity({userId, form}) {
             userId:userInfo[i].userId,
             isRead:STATE.否
         });
+
+         //发送邮件
+        await systemSendMail(userInfo.userId, MAILTYPE.会员活动or会议通知 );
     }
     await addManyData(TABLEENUM.活动通知已读状态表, addReadInfo);
 
+  
+
     return successResult();
 }
 

src/biz/member/order.ts

@@ -2,7 +2,7 @@
  * 订单相关 success
  */
 import moment = require("moment");
-import { AUDITINGCLIENT, COSTTYPE, INDIVIDUALMEMBERTYPE, INVOICESTATUS, ISPAYENUM, ISRECEIVE, MEMBERLEVEL, MEMBERSTATE, MEMBERTYPE, MEMBERTYPEECCENUM, MYORDERLISTPAYSTATE, MYORDERLISTSTATE, OPERATIONREHAVIOR, ORDEREXAMINE, ORDERSTATE, PAYMENTSTATUS, PAYMENTTYPE, RECEIPTCONFIRMATION, STATE, UNITMEMBERTYPE } from "../../config/enum";
+import { AUDITINGCLIENT, COSTTYPE, INDIVIDUALMEMBERTYPE, INVOICESTATUS, ISPAYENUM, ISRECEIVE, MAILTYPE, MEMBERLEVEL, MEMBERSTATE, MEMBERTYPE, MEMBERTYPEECCENUM, MYORDERLISTPAYSTATE, MYORDERLISTSTATE, OPERATIONREHAVIOR, ORDEREXAMINE, ORDERSTATE, PAYMENTSTATUS, PAYMENTTYPE, RECEIPTCONFIRMATION, STATE, UNITMEMBERTYPE } from "../../config/enum";
 import { generateOrderId, successResult } from "../../tools/system";
 import { changeEnumValue, eccEnumValue } from "../../util/verificationEnum";
 import { addOneData } from "../../data/add";
@@ -12,6 +12,7 @@ import { extractData } from "../../util/piecemeal";
 import { BizError } from "../../util/bizError";
 import { ERRORENUM } from "../../config/errorEnum";
 import { updateOneData } from "../../data/update";
+import { systemSendMail } from "../mail";
 
 // db.getCollection('orders').insertOne({ "paymentNum" : "", "offlinePaymentUrl" : "", "weChartPR" : "", "weChartState" : 0, "isFirst" : true, "firstPayExamine" : false, "confirmReceipt" : 0, "confirmReceiptMs" : 0, "invoiceStatus" : 1, "advanceInvoice" : false, "isReceive" : 0, "isReplenishReturnInfo" : false, "refundSuccessful" : false, "isSueInvoicesInAdvance" : false, "id" : "3f9b9936f12ed619f11458ac46ff3835", "orderCycleStart" : 1498262400100.0, "orderCycleEnd" : 1529798400100.0, "unitName" : "西安市艺术学校", "money" : 2000, "paymentMethod" : 0, "userId" : "f2bed663f23c43b751876be9eae93334", "loginId" : "西安市艺术学校1960", "memberCategory" : 2, "invoiceAdd" : "", "state" : 2, "phone" : "13991991926", "ct" : 1734334302795})
 
@@ -631,6 +632,9 @@ export async function refundApprove({id, refundImgUrl}) {
     };
     await addOneData(TABLEENUM.订单审批历史表, addLogInfo );
 
+     //发送邮件
+    await systemSendMail(orderInfo.userId, MAILTYPE.财务退款通知 );
+
     return successResult();
 }
 

src/biz/task.ts

 import moment = require("moment");
-import { ARTICLEPOSITION, MEMBERSTATE, MEMBERTYPE, PARTYBUILDSUBTYPEENUM, PARTYBUILDTYPEENUM, PAYMENTSTATUS, STATE, USERREGISTERSTATE } from "../config/enum";
+import { ARTICLEPOSITION, MAILTYPE, MEMBERSTATE, MEMBERTYPE, PARTYBUILDSUBTYPEENUM, PARTYBUILDTYPEENUM, PAYMENTSTATUS, STATE, USERREGISTERSTATE } from "../config/enum";
 import { TABLEENUM } from "../data/models/model";
 import { find, findCount, findOnce, findOnceToSort } from "../data/select";
 import { createOrder } from "./member/order";
 import { updateOneData } from "../data/update";
 import { addOneData } from "../data/add";
 import { updateRegisterStartQueue } from "./register";
+import { systemSendMail } from "./mail";
 
 /**
  * 初始化任务
@@ -65,6 +66,9 @@ export async function createUserOrder() {
                     await createOrder(userId, loginId, phone, unitName, newOrderStartTime, memberLevel, memberType, subType, false);
                     await updateOneData(TABLEENUM.用户表, {userId}, {paymentStatus:PAYMENTSTATUS.未支付, memberState:MEMBERSTATE.异常, });
                     addCount += 1;
+
+                     //发送邮件
+                    await systemSendMail(userId, MAILTYPE.会员进入宽限期 );
                 }
             }
         }

src/data/models/model.ts

@@ -521,7 +521,7 @@ const ModelArray = [
             refundBankName:"String",
             refundDesc:"String",
             isReplenishReturnInfo:{type:'Boolean', default:false},//是否补充退款信息
-            //
+            //退款
             refundSuccessful:{type:"Boolean", default:false},//退款确认
             refundReject:{type:"Boolean", default:false},//退款驳回 true = 被驳回
             refundImgUrl:"String",