Skip to content

W
wenHuaBu_adminServer
Commit 19b2d48f by lixinming
Options

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

# Conflicts:
#	src/biz/member/finance/costVerification.ts
#	src/biz/member/finance/invoice.ts
parents ff5cae23 d3e653b4
Showing with 135 additions and 18 deletions
src/biz/member/finance/costVerification.ts
......@@ -3,7 +3,7 @@
*/
import moment = require("moment");
import { COSTTYPE, INVOICESTATUS, ISRECEIVE, MEMBERLEVEL, MEMBERSTATE, MEMBERTYPE, ORDEREXAMINE, ORDERSTATE, PAYMENTSTATUS, PAYMENTTYPE, RECEIPTCONFIRMATION, STATE } from "../../../config/enum";
import { COSTTYPE, INVOICESTATUS, ISRECEIVE, 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 } from "../../../data/select";
......@@ -124,10 +124,17 @@ export async function paidList({name, memberType, documentId, phone, mail, joinS
itemData.paymentMethod = "-";
itemData.paymentNum = "-";
}
let userInfo = await findOnce(TABLEENUM.用户表, {userId:info.userId}, ["userId", "memberState", "name", "memberLevel"]);
let userInfo = await findOnce(TABLEENUM.用户表, {userId:info.userId}, ["memberState", "name", "memberLevel", "individualMemberType", "unitMemberType"]);
if (!userInfo || !userInfo.userId) continue;
itemData.memberLevel = changeEnumValue(MEMBERLEVEL, userInfo.memberLevel);
itemData.name = userInfo.name;
if(userInfo.individualMemberType) {
itemData.memberType = changeEnumValue(MEMBERTYPEECCENUM, userInfo.individualMemberType);
}
if(userInfo.unitMemberType) {
itemData.memberType = changeEnumValue(MEMBERTYPEECCENUM, userInfo.unitMemberType);
}
itemData.state = info.confirmReceipt == RECEIPTCONFIRMATION.收款确认 ? "已审核" : "待审核";
itemData.invoiceStatus = info.invoiceStatus == INVOICESTATUS.已开发票 ? "已开" : "未开";
......
src/biz/member/finance/invoice.ts
......@@ -4,7 +4,7 @@
*/
import moment = require("moment");
import { INVOICESTATUS, ISPAYENUM, MEMBERLEVEL, MEMBERSTATE, MEMBERTYPE, ORDEREXAMINE, ORDERSTATE, PAYMENTTYPE, RECEIPTCONFIRMATION } from "../../../config/enum";
import { INVOICESTATUS, ISPAYENUM, MEMBERLEVEL, MEMBERSTATE, MEMBERTYPE, MEMBERTYPEECCENUM, ORDEREXAMINE, ORDERSTATE, PAYMENTTYPE, RECEIPTCONFIRMATION } from "../../../config/enum";
import { TABLEENUM } from "../../../data/models/model";
import { find, findCount, findOnce, findToPage } from "../../../data/select";
import { extractData } from "../../../util/piecemeal";
......@@ -120,9 +120,22 @@ export async function billStateList({name, memberType, documentId, phone, mail,
itemData.memberType = changeEnumValue(MEMBERTYPE, itemData.memberCategory);
itemData.paymentMethod = changeEnumValue(PAYMENTTYPE, itemData.paymentMethod);
itemData.isPay = changeEnumValue(ORDERSTATE, itemData.state);
let userInfomation = await findOnce(TABLEENUM.用户表, {userId:itemData.userId}, ["userId", "memberState", "name"]);
if (!userInfomation || !userInfomation.userId) continue;
itemData.payState = info.state == ORDERSTATE.已支付 ? "已支付" : "未支付";
let userInfomation = await findOnce(TABLEENUM.用户表, {userId:itemData.userId}, ["userId", "memberState", "name", "memberLevel", "individualMemberType", "unitMemberType"]);
if (!userInfomation || !userInfomation.userId) continue;
if(userInfomation) {
if(userInfomation.individualMemberType) {
itemData.memberType = changeEnumValue(MEMBERTYPEECCENUM, userInfomation.individualMemberType);
}
if(userInfomation.unitMemberType) {
itemData.memberType = changeEnumValue(MEMBERTYPEECCENUM, userInfomation.unitMemberType);
}
itemData.memberLevel = changeEnumValue(MEMBERLEVEL, userInfomation.memberLevel);
itemData.memberState = changeEnumValue(MEMBERSTATE, userInfomation.memberState);
}
// 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.weChartCreatePayMs = moment(info.weChartCreatePayMs || info.payTime).format("YYYY-MM-DD");
......@@ -418,9 +431,19 @@ export async function invoicedList({name, memberType, documentId, phone, mail, j
itemData.joinTime = moment(info.orderCycleStart).format("YYYY-MM-DD");
itemData.memberType = changeEnumValue(MEMBERTYPE, itemData.memberCategory);
itemData.paymentMethod = changeEnumValue(PAYMENTTYPE, itemData.paymentMethod);
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")}`;
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}, ["memberState", "name"])
let userInfo = await findOnce(TABLEENUM.用户表, {userId:itemData.userId}, ["memberState", "name", "memberLevel", "individualMemberType", "unitMemberType"])
if(userInfo) {
if(userInfo.individualMemberType) {
itemData.memberType = changeEnumValue(MEMBERTYPEECCENUM, userInfo.individualMemberType);
}
if(userInfo.unitMemberType) {
itemData.memberType = changeEnumValue(MEMBERTYPEECCENUM, userInfo.unitMemberType);
}
itemData.memberLevel = changeEnumValue(MEMBERLEVEL, userInfo.memberLevel);
}
itemData.memberState = changeEnumValue(MEMBERSTATE, userInfo.memberState);
itemData.name = userInfo.name;
dataList.push(itemData);
......
src/biz/member/member.ts
......@@ -2,7 +2,7 @@
* 会员管理逻辑
*/
import { MEMBERSTATE, MEMBERLEVEL, DOCUMENTTYPE, NATION, PROFCATEGORY, MEMBERTYPE, USERREGISTERSTATE, STATE, ADMINLV, ADMINTYPE, SEX, CERTIFICATETYPE, INDIVIDUALMEMBERTYPE, EDUCATION, UNITMEMBERTYPE, CLIENTMEMBERTYPE, BANXUELEIXING } from "../../config/enum";
import { MEMBERSTATE, MEMBERLEVEL, DOCUMENTTYPE, NATION, PROFCATEGORY, MEMBERTYPE, USERREGISTERSTATE, STATE, ADMINLV, ADMINTYPE, SEX, CERTIFICATETYPE, INDIVIDUALMEMBERTYPE, EDUCATION, UNITMEMBERTYPE, CLIENTMEMBERTYPE, BANXUELEIXING, MEMBERTYPEECCENUM } from "../../config/enum";
import { ERRORENUM } from "../../config/errorEnum";
import { TABLEENUM } from "../../data/models/model";
import { find, findCount, findOnce, findOnceToSort, findToPage, findToSortToPage } from "../../data/select";
......@@ -67,7 +67,7 @@ export async function unitMemberList({unitName, mail, phone, joinStartTime, join
let info = dbList[i];
let item:any = extractData(info, SelectFiles);
item.memberState = changeEnumValue(MEMBERSTATE, item.memberState);
item.unitMemberType = changeEnumValue(UNITMEMBERTYPE, item.unitMemberType);
item.unitMemberType = changeEnumValue(MEMBERTYPEECCENUM, item.unitMemberType);
if (!item.memberLevel) item.memberLevel = "未选择";
else item.memberLevel = changeEnumValue(MEMBERLEVEL, item.memberLevel);
item.joinTime = moment(item.joinTime).format("YYYY-MM-DD");
......@@ -280,7 +280,7 @@ export async function individualMemberList({name, documentId, phone, mail, joinS
item.sex = changeEnumValue(SEX, item.sex);
if (!item.memberLevel) item.memberLevel = "未选择";
else item.memberLevel = changeEnumValue(MEMBERLEVEL, item.memberLevel)
item.individualMemberType = changeEnumValue(CLIENTMEMBERTYPE, item.individualMemberType);
item.individualMemberType = changeEnumValue(MEMBERTYPEECCENUM, item.individualMemberType);
item.joinTime = moment(item.joinTime).format("YYYY-MM-DD")
item.lableId = [];
......
src/biz/member/memberFees.ts
......@@ -103,7 +103,7 @@ export async function outPutDataForExcel({type, exportColumns}) {
} else if (key == "paymentYear") {
let 缴费Year = 0;
// 已缴费和缴费期显示缴费年限
if (type == 2 && type == 3) {
if (type == 2 || type == 3) {
orderItemList.forEach(orderItem => {
if (orderItem.state == ORDERSTATE.已支付) {
缴费Year += 1;
......@@ -120,7 +120,7 @@ export async function outPutDataForExcel({type, exportColumns}) {
} else if (key == "durationYear") {
let 欠费Year = 0;
// 已缴费和缴费期显示欠费年限
if (type == 2 && type == 3) {
if (type == 2 || type == 3) {
orderItemList.forEach(orderItem => {
if (orderItem.state == ORDERSTATE.未支付) {
欠费Year += 1;
......@@ -363,7 +363,7 @@ export async function unpaidList({name, memberType, documentId, phone, mail, joi
*/
export async function getRenewalPeriod({name, memberType, documentId, phone, mail, joinStartTime, joinEndTime, memberLevel, pageNumber}) {
const NowMs = new Date().valueOf();
//lifespanEndTime:{"$lt":NowMs + (90 * 24 * 3600 * 1000), "$gt":NowMs},
//lifespanEndTime:{"$gt":NowMs + (90 * 24 * 3600 * 1000), "$gt":NowMs},
let selectParam:any = {
"$or":[
{
......
src/biz/member/msgActivity.ts
......@@ -393,6 +393,49 @@ export async function addActivity({userId, form}) {
await addOneData(TABLEENUM.活动通知表, addInfo);
/**消息对象（标签id）对应的用户新建一条消息未读状态 */
let selectParam = {};
if(form.lableId.includes(CLIENTMSGLABLE.所有人)) {
selectParam = {};
} else if (form.lableId.includes(CLIENTMSGLABLE.个人会员)) {
selectParam = {memberType:{"$in": MEMBERTYPE.个人会员}}
} else if (form.lableId.includes(CLIENTMSGLABLE.单位会员)) {
selectParam = {memberType:{"$in": MEMBERTYPE.单位会员}}
} else if (form.lableId.includes(CLIENTMSGLABLE.理事)) {
selectParam = {memberLever:{"$in": MEMBERLEVEL.理事会员}}
} else if (form.lableId.includes(CLIENTMSGLABLE.常务理事)) {
selectParam = {memberLever:{"$in": MEMBERLEVEL.常务理事会员}}
} else {
selectParam = {lableId:{"$in":form.lableId}}
}
let userInfo = await find(TABLEENUM.用户表, selectParam, ["userId"]);
for (let i = 0; i < userInfo.length; i++) {
/**活动已读Id */
const arId = generateSystemId(TABLEENUM.活动通知已读状态表, userId);
let addReadInfo = {
arId,
activityId,
userId:userInfo[i].userId,
isRead:STATE.否
}
await addOneData(TABLEENUM.活动通知已读状态表, addReadInfo);
}
return successResult();
}
/**
* 修改活动为已读
* @param readId
*/
export async function updateActivityRead({arId}) {
let activityReadInfo = await findOnce(TABLEENUM.活动通知已读状态表, {arId}, ["arId", "isRead"]);
if (!activityReadInfo || !activityReadInfo.arId) throw new BizError(ERRORENUM.目标数据不存在);
if (activityReadInfo.isRead == STATE.是) return;
await updateOneData(TABLEENUM.活动通知已读状态表, {arId}, {readTime:new Date().valueOf(), isRead: STATE.是});
return successResult();
}
......@@ -626,14 +669,41 @@ export async function seeActivity({userId}) {
let dataList = [];
if (activityInfo) {
activityInfo.forEach( info => {
for (let i = 0; i < activityInfo.length; i++) {
let info = activityInfo[i];
let item:any = extractData(info, SelectFiles);
// item.activityStartTime = moment(item.activityStartTime).format("YYYY-MM-DD");
// item.activityEndTime = moment(item.activityEndTime).format("YYYY-MM-DD");
if (item.activityStartTime) item.activityStartTime = moment(item.activityStartTime).format("YYYY-MM-DD");
if (item.activityEndTime) item.activityEndTime = moment(item.activityEndTime).format("YYYY-MM-DD");
//会员的消息已读数据
let selectActivityParam:any = {activityId:item.activityId, userId:userId};
// if (!userId) selectMsgParam.userId = userId;
let readOldInfo = await findOnce(TABLEENUM.活动通知已读状态表, selectActivityParam, ["arId", "isRead"]);
let readInfo:any = {};
/**没有已读状态的用户新建一条活动未读状态 */
if (!readOldInfo) {
/**活动已读Id */
const arId = generateSystemId(TABLEENUM.活动通知已读状态表, userId);
let addReadInfo = {
arId,
activityId:item.activityId,
userId,
isRead:STATE.否
}
await addOneData(TABLEENUM.活动通知已读状态表, addReadInfo);
readInfo = await findOnce(TABLEENUM.活动通知已读状态表, selectActivityParam, ["arId", "isRead"]);
} else {
readInfo = readOldInfo;
}
item.arId = readInfo.arId;
item.isRead = readInfo.isRead;
dataList.push(item);
})
}
}
return {dataList};
......
src/biz/member/order.ts
......@@ -2,7 +2,7 @@
* 订单相关 success
*/
import moment = require("moment");
import { AUDITINGCLIENT, COSTTYPE, INDIVIDUALMEMBERTYPE, INVOICESTATUS, ISPAYENUM, ISRECEIVE, MEMBERLEVEL, MEMBERSTATE, MEMBERTYPE, MYORDERLISTPAYSTATE, MYORDERLISTSTATE, OPERATIONREHAVIOR, ORDEREXAMINE, ORDERSTATE, PAYMENTSTATUS, PAYMENTTYPE, RECEIPTCONFIRMATION, STATE, UNITMEMBERTYPE } from "../../config/enum";
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 { generateOrderId, successResult } from "../../tools/system";
import { changeEnumValue, eccEnumValue } from "../../util/verificationEnum";
import { addOneData } from "../../data/add";
......@@ -531,8 +531,17 @@ export async function refundList({name, pageNumber}) {
// itemData.joinTime = moment(info.orderCycleStart).format("YYYY-MM-DD");
itemData.memberType = changeEnumValue(MEMBERTYPE, itemData.memberCategory);
itemData.cycle = `${moment(info.orderCycleStart).format("YYYY-MM-DD")}至${moment(info.orderCycleEnd).format("YYYY-MM-DD")}`;
let userInfo = await findOnce(TABLEENUM.用户表, {userId:itemData.userId}, ["memberState", "name"]);
if (userInfo) itemData.name = userInfo.name;
let userInfo = await findOnce(TABLEENUM.用户表, {userId:itemData.userId}, ["memberState", "name", "individualMemberType", "unitMemberType"]);
if (userInfo) {
itemData.name = userInfo.name;
if(userInfo.individualMemberType) {
itemData.memberType = changeEnumValue(MEMBERTYPEECCENUM, userInfo.individualMemberType);
}
if(userInfo.unitMemberType) {
itemData.memberType = changeEnumValue(MEMBERTYPEECCENUM, userInfo.unitMemberType);
}
}
if (!info.isReplenishReturnInfo) itemData.state = "资料补充中";
else {
......
src/routers/msgActivity/router.ts
......@@ -145,6 +145,14 @@ export const Config = {
bindBiz:msgActivityBiz.addActivity
},
{
apiName:"修改活动为已读",
subUrl:'/msgdb/updataactivityread',
param:[
{key:"arId", type:"String", desc:"活动已读Id"},
],
bindBiz:msgActivityBiz.updateActivityRead
},
{
apiName:"获取活动详细-修改回显",
subUrl:'/activitydb/activitydetailed',
param:[
......
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