Skip to content

W
wenHuaBu_adminServer
Commit f1f8e4d0 by chenjinjing
Options

no message

parent a0c994c3
Showing with 101 additions and 29 deletions
src/biz/mail.ts
...@@ -10,17 +10,29 @@ import { eccEnumValue } from "../util/verificationEnum"; ...@@ -10,17 +10,29 @@ import { eccEnumValue } from "../util/verificationEnum";
const nodemailer = require('nodemailer'); const nodemailer = require('nodemailer');
// 创建发送邮件的传输对象 // 创建发送邮件的传输对象
// let transporter = nodemailer.createTransport({
// host: 'smtp.163.com', // SMTP 服务器地址
// port: 465, // SMTP 服务器端口（通常是 465 或 587）
// secure: true, // 使用 SSL
// auth: {
// user: 'cefa_office@163.com', // 你的邮箱地址
// pass: 'EJRazhkkXK65gnLe' // 你的邮箱密码或应用专用密码
// }
// });
// 测试用邮箱地址
let transporter = nodemailer.createTransport({ let transporter = nodemailer.createTransport({
host: 'smtp.163.com', // SMTP 服务器地址 host: 'smtp.qq.com', // SMTP 服务器地址
port: 465, // SMTP 服务器端口（通常是 465 或 587） port: 465, // SMTP 服务器端口（通常是 465 或 587）
secure: true, // 使用 SSL secure: true, // 使用 SSL
auth: { auth: {
user: 'cefa_office@163.com', // 你的邮箱地址 user: '3102438911@qq.com', // 你的邮箱地址
pass: 'EJRazhkkXK65gnLe' // 你的邮箱密码或应用专用密码 pass: 'erdfcv425860.' // 你的邮箱密码或应用专用密码
} }
}); });
async function send(toMail, name, type) { async function send(toMail, name, type) {
let {title, mailStr} = getModel(name, type); let {title, mailStr} = getModel(name, type);
// 设置邮件选项 // 设置邮件选项
......
src/biz/member/cost.ts
...@@ -164,11 +164,15 @@ export async function testCallback(weChartPR) { ...@@ -164,11 +164,15 @@ export async function testCallback(weChartPR) {
} }
if (Object.keys(updateUserInfo).length) await updateOneData(TABLEENUM.用户表, {userId:oldInfo.userId}, updateUserInfo); if (Object.keys(updateUserInfo).length) await updateOneData(TABLEENUM.用户表, {userId:oldInfo.userId}, updateUserInfo);
let history = await findOnce(TABLEENUM.订单审批历史表, {orderId:oldInfo.id});
let operationBehavior = ORDEREXAMINE.用户提交;
if (history && history.orderId) operationBehavior = ORDEREXAMINE.用户重新提交;
//添加审批日志 //添加审批日志
let addLogInfo = { let addLogInfo = {
orderId:oldInfo.id, orderId:oldInfo.id,
operationTime:new Date().valueOf(), operationTime:new Date().valueOf(),
operationBehavior:ORDEREXAMINE.用户提交, operationBehavior,
remarks:"微信付款" remarks:"微信付款"
}; };
await addOneData(TABLEENUM.订单审批历史表, addLogInfo ); await addOneData(TABLEENUM.订单审批历史表, addLogInfo );
...@@ -228,11 +232,15 @@ export async function payCallback(body) { ...@@ -228,11 +232,15 @@ export async function payCallback(body) {
} }
if (Object.keys(updateUserInfo).length) await updateOneData(TABLEENUM.用户表, {userId:oldInfo.userId}, updateUserInfo); if (Object.keys(updateUserInfo).length) await updateOneData(TABLEENUM.用户表, {userId:oldInfo.userId}, updateUserInfo);
let history = await findOnce(TABLEENUM.订单审批历史表, {orderId:oldInfo.id});
let operationBehavior = ORDEREXAMINE.用户提交;
if (history && history.orderId) operationBehavior = ORDEREXAMINE.用户重新提交;
//添加审批日志 //添加审批日志
let addLogInfo = { let addLogInfo = {
orderId:oldInfo.id, orderId:oldInfo.id,
operationTime:new Date().valueOf(), operationTime:new Date().valueOf(),
operationBehavior:ORDEREXAMINE.用户提交, operationBehavior,
remarks:"微信付款" remarks:"微信付款"
}; };
await addOneData(TABLEENUM.订单审批历史表, addLogInfo ); await addOneData(TABLEENUM.订单审批历史表, addLogInfo );
......
src/biz/member/finance/costVerification.ts
...@@ -121,7 +121,7 @@ export async function paidList({name, memberType, documentId, phone, mail, joinS ...@@ -121,7 +121,7 @@ export async function paidList({name, memberType, documentId, phone, mail, joinS
let dataList = []; let dataList = [];
let itemFile = ["id", "unitName", "money", "paymentNum", "userId"]; let itemFile = ["id", "unitName", "money", "paymentNum", "userId", "paymentMethod"];
for ( let i = 0; i < dbList.length; i++) { for ( let i = 0; i < dbList.length; i++) {
let info = dbList[i]; let info = dbList[i];
let itemData:any = extractData(info, itemFile); let itemData:any = extractData(info, itemFile);
...@@ -129,7 +129,7 @@ export async function paidList({name, memberType, documentId, phone, mail, joinS ...@@ -129,7 +129,7 @@ export async function paidList({name, memberType, documentId, phone, mail, joinS
itemData.joinTime = moment(info.orderCycleStart).format("YYYY-MM-DD"); itemData.joinTime = moment(info.orderCycleStart).format("YYYY-MM-DD");
itemData.operationTime = moment(info.payTime).format("YYYY-MM-DD"); itemData.operationTime = moment(info.payTime).format("YYYY-MM-DD");
itemData.memberType = changeEnumValue(MEMBERTYPE, info.memberCategory); itemData.memberType = changeEnumValue(MEMBERTYPE, info.memberCategory);
// itemData.paymentMethod = changeEnumValue(PAYMENTTYPE, info.paymentMethod); itemData.paymentMethod = changeEnumValue(PAYMENTTYPE, info.paymentMethod);
itemData.costType = info.isFirst == COSTTYPE.首次 ? "首次" : "续费"; itemData.costType = info.isFirst == COSTTYPE.首次 ? "首次" : "续费";
itemData.cycle = `${moment(info.orderCycleStart).format("YYYY")}至${moment(info.orderCycleEnd).format("YYYY")}` itemData.cycle = `${moment(info.orderCycleStart).format("YYYY")}至${moment(info.orderCycleEnd).format("YYYY")}`
...@@ -285,14 +285,16 @@ export async function outPutConfirmReceipt({exportColumns, payType, examineState ...@@ -285,14 +285,16 @@ export async function outPutConfirmReceipt({exportColumns, payType, examineState
selectConf.push(info.value); selectConf.push(info.value);
}) })
let selectFile = ["id", "unitName", "userId", "orderCycleStart", "orderCycleEnd", "money", "paymentMethod", "memberCategory", "paymentNum", "desc", "invoiceMail", "payTime", "confirmReceipt"]; let selectFile = ["id", "unitName", "userId", "orderCycleStart", "orderCycleEnd", "money", "paymentMethod", "memberCategory", "paymentNum", "desc",
"invoiceMail", "payTime", "confirmReceipt", "invoiceStatus"];
let dbList = await find(TABLEENUM.订单表, findParam, selectFile); let dbList = await find(TABLEENUM.订单表, findParam, selectFile);
let timeChnageList = ["payTime"]; //"orderCycleStart", "operationTime" let timeChnageList = ["payTime"]; //"orderCycleStart", "operationTime"
let dataList = [selectTitle]; let dataList = [selectTitle];
for (let i = 0; i < dbList.length; i++) { for (let i = 0; i < dbList.length; i++) {
let info = dbList[i]; let info = dbList[i];
let userInfo = await findOnce(TABLEENUM.用户表, {userId:info.userId}, ["memberState", "name", "session", "unitName", "documentId", "uscc", "mail", "unitMail", "memberLevel", "phone"]); let userInfo = await findOnce(TABLEENUM.用户表, {userId:info.userId}, ["memberState", "name", "session", "unitName", "documentId", "uscc", "mail",
"unitMail", "memberLevel", "phone"]);
let subList = []; let subList = [];
for (let i = 0; i < selectConf.length; i++) { for (let i = 0; i < selectConf.length; i++) {
let key = selectConf[i]; let key = selectConf[i];
...@@ -326,6 +328,7 @@ export async function outPutConfirmReceipt({exportColumns, payType, examineState ...@@ -326,6 +328,7 @@ export async function outPutConfirmReceipt({exportColumns, payType, examineState
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 == "memberLevel") value = changeEnumValue(MEMBERLEVEL, value);
else if (key == "paymentMethod") value = changeEnumValue(PAYMENTTYPE, value); else if (key == "paymentMethod") value = changeEnumValue(PAYMENTTYPE, value);
else if (key == "invoiceStatus") value = changeEnumValue(INVOICESTATUS, value);
} }
subList.push(value); subList.push(value);
} }
......
src/biz/member/finance/invoice.ts
...@@ -196,10 +196,28 @@ export async function confirmReceiptHistory({id}) { ...@@ -196,10 +196,28 @@ export async function confirmReceiptHistory({id}) {
let dataList = []; let dataList = [];
dbList.sort((a, b) => {return b.operationTime- a.operationTime}); dbList.sort((a, b) => {return b.operationTime- a.operationTime});
dbList.forEach(info => { dbList.forEach(info => {
let item:any = extractData(info, ["operationTime", "operationBehavior", "remarks", "refundImgUrl"]); let item:any = extractData(info, ["operationTime", "operationBehavior", "remarks", "refundImgUrl", "isReceiveMoney"]);
item.operationTime = moment(item.operationTime).format("YYYY-MM-DD HH:mm:SS"); item.operationTime = moment(item.operationTime).format("YYYY-MM-DD HH:mm:SS");
item.operationBehavior = changeEnumValue(ORDEREXAMINE, item.operationBehavior); // item.operationBehavior = changeEnumValue(ORDEREXAMINE, item.operationBehavior);
item.desc = "";
let operationBehaviorStr = changeEnumValue(ORDEREXAMINE, item.operationBehavior);
if (item.operationBehavior == ORDEREXAMINE.用户提交) {
item.desc = "未收到/已收到"; //线下付款
} else {
if (item.isReceiveMoney) { //判断是否收到款项
if (info.operationBehavior == ORDEREXAMINE.驳回) operationBehaviorStr = `${changeEnumValue(ORDEREXAMINE, info.operationBehavior)}-不需退款`;
item.desc = "未收到/已收到"
} else {
if (info.operationBehavior == ORDEREXAMINE.驳回) operationBehaviorStr = `${changeEnumValue(ORDEREXAMINE, info.operationBehavior)}-需退款`;
item.desc = "已收到"
}
// desc = isReceiveMoney ? changeEnumValue(ISRECEIVE, ISRECEIVE.未收到款项_xg其他) : changeEnumValue(ISRECEIVE, ISRECEIVE.提供账户_zkh需退款_ykh)
}
item.operationBehavior = operationBehaviorStr;
dataList.push(item); dataList.push(item);
}); });
......
src/biz/member/order.ts
...@@ -428,11 +428,15 @@ export async function getInvoiceStatus({id}) { ...@@ -428,11 +428,15 @@ export async function getInvoiceStatus({id}) {
await updateOneData(TABLEENUM.订单表, {id}, updateInfo); await updateOneData(TABLEENUM.订单表, {id}, updateInfo);
let history = await findOnce(TABLEENUM.订单审批历史表, {orderId:id});
let operationBehavior = ORDEREXAMINE.用户提交;
if (history && history.orderId) operationBehavior = ORDEREXAMINE.用户重新提交;
//添加日志 //添加日志
let addLogInfo = { let addLogInfo = {
orderId:id, orderId:id,
operationTime:new Date().valueOf(), operationTime:new Date().valueOf(),
operationBehavior:ORDEREXAMINE.用户提交, operationBehavior,
remarks:`${desc}` remarks:`${desc}`
}; };
await addOneData(TABLEENUM.订单审批历史表, addLogInfo ); await addOneData(TABLEENUM.订单审批历史表, addLogInfo );
...@@ -455,9 +459,21 @@ export async function reasonInfo({id}) { ...@@ -455,9 +459,21 @@ export async function reasonInfo({id}) {
let dataList = []; let dataList = [];
logInfoList.forEach(info => { logInfoList.forEach(info => {
let isReceiveMoney = info.isReceiveMoney ? "已收到" : "未收到"; // let isReceiveMoney = info.isReceiveMoney ? "已收到" : "未收到";
let isReceiveMoney = "";
let operationBehaviorStr = changeEnumValue(ORDEREXAMINE, info.operationBehavior);
if (info.operationBehavior == ORDEREXAMINE.用户提交) isReceiveMoney = "未收到/已收到"; //线下付款
else {
if (isReceiveMoney) { //判断是否收到款项
if (info.operationBehavior == ORDEREXAMINE.驳回) operationBehaviorStr = `${changeEnumValue(ORDEREXAMINE, info.operationBehavior)}-不需退款`;
isReceiveMoney = "未收到/已收到"
} else {
if (info.operationBehavior == ORDEREXAMINE.驳回) operationBehaviorStr = `${changeEnumValue(ORDEREXAMINE, info.operationBehavior)}-需退款`;
isReceiveMoney = "已收到"
}
}
let remarks = info.remarks let remarks = info.remarks;
if (info.operationBehavior == ORDEREXAMINE.退款申请) { if (info.operationBehavior == ORDEREXAMINE.退款申请) {
isReceiveMoney = "-"; isReceiveMoney = "-";
if (info.refundName) remarks += `-${info.refundName}`; if (info.refundName) remarks += `-${info.refundName}`;
...@@ -470,7 +486,8 @@ export async function reasonInfo({id}) { ...@@ -470,7 +486,8 @@ export async function reasonInfo({id}) {
let dataInfo = { let dataInfo = {
operationTime:moment(info.operationTime).format("YYYY/MM/DD HH:mm:SS"), operationTime:moment(info.operationTime).format("YYYY/MM/DD HH:mm:SS"),
behavior:changeEnumValue(ORDEREXAMINE, info.operationBehavior), // behavior:changeEnumValue(ORDEREXAMINE, info.operationBehavior),
behavior:operationBehaviorStr,
isReceiveMoney, isReceiveMoney,
remarks remarks
}; };
...@@ -529,6 +546,10 @@ export async function accountInfo({id, form}) { ...@@ -529,6 +546,10 @@ export async function accountInfo({id, form}) {
export async function refundList({name, memberType, joinStartTime, joinEndTime, pageNumber}) { export async function refundList({name, memberType, joinStartTime, joinEndTime, pageNumber}) {
let findParam:any = { let findParam:any = {
isReceive:{"$gt":0} isReceive:{"$gt":0}
// "$or":[
// {isReceive:{"$gt":0}, state:ORDERSTATE.未支付},
// {isReceive:{"$gt":1}, state:ORDERSTATE.已支付}
// ]
}; };
/**用户表查询条件 */ /**用户表查询条件 */
...@@ -567,13 +588,14 @@ export async function refundList({name, memberType, joinStartTime, joinEndTime, ...@@ -567,13 +588,14 @@ export async function refundList({name, memberType, joinStartTime, joinEndTime,
findParam.userId = {"$in":checkUserIdList} findParam.userId = {"$in":checkUserIdList}
} }
let selectFile = ["id", "unitName", "orderCycleStart", "orderCycleEnd", "money", "memberCategory", "userId", "refundBankCarId", "refundBankName", "refundSuccessful", "isReplenishReturnInfo", "desc", "isReceive" ]; let selectFile = ["id", "unitName", "orderCycleStart", "orderCycleEnd", "money", "memberCategory", "userId", "refundBankCarId", "refundBankName", "refundSuccessful",
"isReplenishReturnInfo", "desc", "isReceive", "refundImgUrl" ];
let dbList = await findToSortToPage(TABLEENUM.订单表, findParam, selectFile, {orderCycleStart:-1}, pageNumber); let dbList = await findToSortToPage(TABLEENUM.订单表, findParam, selectFile, {orderCycleStart:-1}, pageNumber);
let dataCount = await findCount(TABLEENUM.订单表, findParam); let dataCount = await findCount(TABLEENUM.订单表, findParam);
let dataList = []; let dataList = [];
let itemFile = ["id", "name", "unitName", "money", "userId", "memberCategory", "refundBankCarId", "refundBankName", "desc", "isReceive"]; let itemFile = ["id", "name", "unitName", "money", "userId", "memberCategory", "refundBankCarId", "refundBankName", "desc", "isReceive", "refundImgUrl"];
for (let i = 0; i < dbList.length; i++) { for (let i = 0; i < dbList.length; i++) {
let info = dbList[i]; let info = dbList[i];
...@@ -581,6 +603,7 @@ export async function refundList({name, memberType, joinStartTime, joinEndTime, ...@@ -581,6 +603,7 @@ export async function refundList({name, memberType, joinStartTime, joinEndTime,
// itemData.joinTime = moment(info.orderCycleStart).format("YYYY-MM-DD"); // itemData.joinTime = moment(info.orderCycleStart).format("YYYY-MM-DD");
itemData.memberType = changeEnumValue(MEMBERTYPE, itemData.memberCategory); itemData.memberType = changeEnumValue(MEMBERTYPE, itemData.memberCategory);
itemData.cycle = `${moment(info.orderCycleStart).format("YYYY-MM-DD")}至${moment(info.orderCycleEnd).format("YYYY-MM-DD")}`; itemData.cycle = `${moment(info.orderCycleStart).format("YYYY-MM-DD")}至${moment(info.orderCycleEnd).format("YYYY-MM-DD")}`;
if (!info.refundImgUrl) itemData.refundImgUrl = "-";
let userInfo = await findOnce(TABLEENUM.用户表, {userId:itemData.userId}, ["memberState", "name", "individualMemberType", "unitMemberType"]); let userInfo = await findOnce(TABLEENUM.用户表, {userId:itemData.userId}, ["memberState", "name", "individualMemberType", "unitMemberType"]);
if (userInfo) { if (userInfo) {
...@@ -734,22 +757,23 @@ export async function refundOut({id, desc}) { ...@@ -734,22 +757,23 @@ export async function refundOut({id, desc}) {
let desc = ""; let desc = "";
let operationBehaviorStr = changeEnumValue(ORDEREXAMINE, operationBehavior); let operationBehaviorStr = changeEnumValue(ORDEREXAMINE, operationBehavior);
if (operationBehavior == ORDEREXAMINE.用户提交) desc = "未收到/已收到"; //线下付款 if (operationBehavior == ORDEREXAMINE.用户提交) {
else { desc = "未收到/已收到"; //线下付款
} else {
if (isReceiveMoney) { //判断是否收到款项 if (isReceiveMoney) { //判断是否收到款项
if (info.operationBehavior == ORDEREXAMINE.驳回) operationBehaviorStr = `${changeEnumValue(ORDEREXAMINE, info.operationBehavior)}"-需退款"`; if (info.operationBehavior == ORDEREXAMINE.驳回) operationBehaviorStr = `${changeEnumValue(ORDEREXAMINE, info.operationBehavior)}-不需退款`;
isReceiveMoney = "已收到" desc = "未收到/已收到"
} else { } else {
if (info.operationBehavior == ORDEREXAMINE.驳回) operationBehaviorStr = `${changeEnumValue(ORDEREXAMINE, info.operationBehavior)}"-不需退款"`; if (info.operationBehavior == ORDEREXAMINE.驳回) operationBehaviorStr = `${changeEnumValue(ORDEREXAMINE, info.operationBehavior)}-需退款`;
isReceiveMoney = "未收到/已收到" desc = "已收到"
} }
// desc = isReceiveMoney ? changeEnumValue(ISRECEIVE, ISRECEIVE.未收到款项_xg其他) : changeEnumValue(ISRECEIVE, ISRECEIVE.提供账户_zkh需退款_ykh) // desc = isReceiveMoney ? changeEnumValue(ISRECEIVE, ISRECEIVE.未收到款项_xg其他) : changeEnumValue(ISRECEIVE, ISRECEIVE.提供账户_zkh需退款_ykh)
} }
let addInfo:any = { let addInfo:any = {
operationTime, operationTime,
// operationTime:moment(operationTime).format("YYYY-MM-DD HH:mm:SS"), // operationTime:moment(operationTime).format("YYYY-MM-DD HH:mm:SS"),
// operationBehavior:operationBehaviorStr, operationBehavior:operationBehaviorStr,
operationBehavior:changeEnumValue(ORDEREXAMINE, operationBehavior), // operationBehavior:changeEnumValue(ORDEREXAMINE, operationBehavior),
desc, desc,
other:remarks other:remarks
}; };
...@@ -817,11 +841,15 @@ export async function reconfirm({id, weChartPR, offlinePaymentUrl, desc}) { ...@@ -817,11 +841,15 @@ export async function reconfirm({id, weChartPR, offlinePaymentUrl, desc}) {
await updateOneData(TABLEENUM.订单表, {id}, updateInfo); await updateOneData(TABLEENUM.订单表, {id}, updateInfo);
let history = await findOnce(TABLEENUM.订单审批历史表, {orderId:id});
let operationBehavior = ORDEREXAMINE.用户提交;
if (history && history.orderId) operationBehavior = ORDEREXAMINE.用户重新提交;
//添加日志 //添加日志
let addLogInfo = { let addLogInfo = {
orderId:id, orderId:id,
operationTime:new Date().valueOf(), operationTime:new Date().valueOf(),
operationBehavior:ORDEREXAMINE.用户提交, operationBehavior,
remarks:`${desc}` remarks:`${desc}`
}; };
await addOneData(TABLEENUM.订单审批历史表, addLogInfo ); await addOneData(TABLEENUM.订单审批历史表, addLogInfo );
......
src/biz/member/rightsMgmt.ts
...@@ -133,6 +133,7 @@ export async function info({id}) { ...@@ -133,6 +133,7 @@ export async function info({id}) {
let firstKey = Math.floor(adminLv/100); let firstKey = Math.floor(adminLv/100);
if (!distinctMap[firstKey]) distinctMap[firstKey] = [] if (!distinctMap[firstKey]) distinctMap[firstKey] = []
if(distinctMap[firstKey]) { if(distinctMap[firstKey]) {
if (adminLv == 205) adminLv = 211; //2025.2.28 变更管理目录删除，改成会员权限
distinctMap[firstKey].push({ distinctMap[firstKey].push({
key:ADMINLV[adminLv], key:ADMINLV[adminLv],
value:adminLv value:adminLv
......
src/config/enum.ts
...@@ -550,7 +550,8 @@ export enum OPERATIONREHAVIOR { ...@@ -550,7 +550,8 @@ export enum OPERATIONREHAVIOR {
重新提交, 重新提交,
驳回修改, 驳回修改,
通过, 通过,
用户提交 用户提交,
用户重新提交
} }
...@@ -602,7 +603,6 @@ export enum ADMINLV { ...@@ -602,7 +603,6 @@ export enum ADMINLV {
发票管理, 发票管理,
// 变更管理, 205 // 变更管理, 205
管理设置 = 206, 管理设置 = 206,
// 管理权限 = 206,
标签系统, 标签系统,
通知管理 = 208, 通知管理 = 208,
会员信息修改 = 209, 会员信息修改 = 209,
...@@ -781,7 +781,8 @@ export enum ORDEREXAMINE { ...@@ -781,7 +781,8 @@ export enum ORDEREXAMINE {
审核时间,//审核时间 审核时间,//审核时间
已开票,//已开票 已开票,//已开票
退款申请,//退款申请 退款申请,//退款申请
已退款//已退款 已退款,//已退款
用户重新提交,
} }
......
src/config/outPutConfig.ts
...@@ -95,6 +95,7 @@ export enum CONFIRMRECEIPTCOLUMNS { ...@@ -95,6 +95,7 @@ export enum CONFIRMRECEIPTCOLUMNS {
注册手机号="phone", 注册手机号="phone",
届次 = "session", 届次 = "session",
支付时间 = "payTime", //微信支付的时间 支付时间 = "payTime", //微信支付的时间
发票状态 = "invoiceStatus",
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment