no message

src/biz/mail.ts

-import { MEMBERTYPE, MAILTYPE } from "../config/enum";
+import { MAILTYPE, MEMBERTYPE } from "../config/enum";
 import { ERRORENUM } from "../config/errorEnum";
+import { CLIENTMAILTYPE } from "../config/outPutConfig";
 import { TABLEENUM } from "../data/models/model";
 import { findOnce } from "../data/select";
 import { successErrorResult, successResult } from "../tools/system";
 import { BizError } from "../util/bizError";
+import { eccEnumValue } from "../util/verificationEnum";
 
 const nodemailer = require('nodemailer');
 
@@ -117,8 +119,13 @@ function getModel(name, type) {
 }
 
 
+/**
+ * 发送邮件 （管理后台触发）
+ * @param param0 
+ * @returns 
+ */
 export async function sendMail({id, type}) {
-
+    eccEnumValue("发送邮件", "邮件类型", CLIENTMAILTYPE, type);
     let userInfo = await findOnce(TABLEENUM.用户表, {userId:id}, ["userId", "name", "unitName", "memberType", "mail"]);
 
     if (!userInfo || !userInfo.userId) throw new BizError(ERRORENUM.用户不存在);
@@ -131,3 +138,23 @@ export async function sendMail({id, type}) {
 
     return successResult();
 }
+
+
+/**
+ * 系统发送邮件
+ * @param userId 
+ * @param type 
+ */
+export async function systemSendMail(userId, type) {
+    let userInfo = await findOnce(TABLEENUM.用户表, {userId:userId}, ["userId", "name", "unitName", "memberType", "mail"]);
+
+    if (!userInfo || !userInfo.userId) throw new BizError(ERRORENUM.用户不存在);
+    if (!userInfo.mail) {
+        new BizError(ERRORENUM.该用户邮箱为空, userId, userInfo.name || userId.unitName);
+    }
+
+    let nameStr = userInfo.memberType == MEMBERTYPE.个人会员 ? userInfo.name : userInfo.unitName;
+    let result = await send(userInfo.mail, nameStr, type);
+
+    return successResult();
+}
\ No newline at end of file

src/biz/member/examine.ts

@@ -3,7 +3,7 @@
  */
 
 import moment = require("moment");
-import { BANXUELEIXING, CERTIFICATETYPE, DOCUMENTTYPE, EDUCATION, INDIVIDUALMEMBERTYPE, LOGONSTATE, MEMBERLEVEL, MEMBERSTATE, MEMBERTYPE, MEMBERTYPEECCENUM, NATION, OPERATIONREHAVIOR, PAYMENTSTATUS, PROFCATEGORY, REGISTERFLOW, SEX, STATE, UNITMEMBERTYPE, USERREGISTERSTATE } from "../../config/enum";
+import { BANXUELEIXING, CERTIFICATETYPE, DOCUMENTTYPE, EDUCATION, INDIVIDUALMEMBERTYPE, LOGONSTATE, MAILTYPE, MEMBERLEVEL, MEMBERSTATE, MEMBERTYPE, MEMBERTYPEECCENUM, NATION, OPERATIONREHAVIOR, PAYMENTSTATUS, PROFCATEGORY, REGISTERFLOW, SEX, STATE, UNITMEMBERTYPE, USERREGISTERSTATE } from "../../config/enum";
 import { ERRORENUM } from "../../config/errorEnum";
 import { addManyData } from "../../data/add";
 import { TABLEENUM } from "../../data/models/model";
@@ -18,6 +18,7 @@ import { getCityNameByCode } from "../../config/cityConfig";
 import { sendPassNotice } from "../sms";
 import { SessionTimeMsConfig } from "../../config/serverConfig";
 import { deleteOneData } from "../../data/delete";
+import { systemSendMail } from "../mail";
 
 /**
  * 待审核列表 success 入会申请
@@ -458,6 +459,8 @@ export async function adopt({id, session}) {
     //发送短信
     let smsName = userInfo.memberType == MEMBERTYPE.个人会员 ? userInfo.name : userInfo.unitName;
     await sendPassNotice(userInfo.phone, smsName);
+    //发送邮件
+    await systemSendMail(userInfo.userId, MAILTYPE.审核通过以及缴费通知 );
 
     return successResult();
 }
@@ -587,6 +590,9 @@ export async function reject({id, remarks}) {
     };
     await addManyData(TABLEENUM.审批历史表, addApprovalHistory);
 
+    //发送邮件
+    await systemSendMail(userInfo.userId, MAILTYPE.审核期间驳回通知 );
+
     return successResult();
 }
 

src/biz/member/order.ts

@@ -454,7 +454,7 @@ export async function reasonInfo({id}) {
 
     let dataList = [];
     logInfoList.forEach(info => {
-        let isReceiveMoney = info.isReceiveMoney ? "已到款项" : "未到款项";
+        let isReceiveMoney = info.isReceiveMoney ? "已收到" : "未收到";
         
         let remarks = info.remarks
         if (info.operationBehavior == ORDEREXAMINE.退款申请) {
@@ -463,6 +463,7 @@ export async function reasonInfo({id}) {
             if (info.refundBankNum) remarks += `-${info.refundBankNum}`;
             if (info.refundBankName) remarks += `-${info.refundBankName}`;
         } else if (info.operationBehavior == ORDEREXAMINE.用户提交) {
+            // isReceiveMoney = "-";
             isReceiveMoney = "-";
         }
 

src/config/outPutConfig.ts

@@ -198,7 +198,7 @@ export enum MEMBERPAYMENTCOLUMNS {
 /**
  * 邮件类型
  */
-export enum MAILTYPE {
+export enum CLIENTMAILTYPE {
     会员会费到期缴费通知 = 6,
     会员催缴通知提前开发票 = 7,
     会员活动or会议通知 = 12

src/routers/public/router.ts

@@ -362,7 +362,7 @@ export const Config = {
             apiName:"邮件类型",
             subUrl:'/mailtype',
             param:[],
-            defaultParam:outPutConfig.MAILTYPE,
+            defaultParam:outPutConfig.CLIENTMAILTYPE,
             bindBiz:publicBiz.setEnumInterface
         }
     ],