Skip to content

W
wenHuaBu_adminServer
Commit c17f3599 by lixinming
Options

no message

parent 2e672d31
Showing with 208 additions and 89 deletions
src/biz/member/examine.ts
......@@ -188,7 +188,12 @@ export async function adopt({id, session}) {
}
//创建初始订单
await createOrder(id, userInfo.loginId, userInfo.phone, unitName, joinTime + 1000, MEMBERLEVEL.普通会员, userInfo.memberType, subType, true);
//创建初始订单应该使用
//创建今年的订单
let thisYear = new Date().getFullYear();
let orderStartMonthStr = moment(joinTime).format("MM-DD HH:mm:SS");
let orderStartMs = new Date(`${thisYear}-${orderStartMonthStr}`).valueOf();
await createOrder(id, userInfo.loginId, userInfo.phone, unitName, orderStartMs, MEMBERLEVEL.普通会员, userInfo.memberType, subType, true);
await updateOneData(TABLEENUM.用户表, {userId:id}, updateInfo);
......
src/biz/member/order.ts
......@@ -178,30 +178,56 @@ export async function paidList({name, memberType, documentId, phone, mail, joinS
confirmReceipt:RECEIPTCONFIRMATION.待确认,
state:ORDERSTATE.已支付
}
/**用户表查询条件 */
let checkUserIdList = [];
let itemParam:any = {};
let isSelectUser = false;
if (name) {
findParam["$or"] = [
{unitName:{"$regex":`${name}`}, memberType:MEMBERTYPE.单位会员},
{name:{"$regex":`${name}`}, memberType:MEMBERTYPE.个人会员}
]
}
if (memberType.length) {
if (memberType < UNITMEMBERTYPE.院校) {
findParam.individualMemberType = {"$in":memberType};
} else {
findParam.unitMemberType = {"$in":memberType};
isSelectUser = true;
itemParam = {
"$or":[
{unitName:{"$regex":`${name}`}},
{name:{"$regex":`${name}`}}
]
}
}
if (documentId) findParam.documentId = documentId;
if (phone) findParam.phone = phone;
if (mail) findParam.mail = mail;
if (memberType && memberType.length) {
isSelectUser = true;
itemParam["$or"] = [ {unitMemberType:{"$in":memberType}}, {individualMemberType:{"$in":memberType}} ];
}
if (documentId) {
isSelectUser = true;
itemParam.documentId = documentId;
}
if (mail) {
isSelectUser = true;
itemParam.mail = mail;
}
if (joinStartTime) {
findParam["joinTime"] = {"$gt":joinStartTime};
isSelectUser = true;
itemParam["joinTime"] = {"$gt":joinStartTime};
}
if (joinEndTime) {
if (!findParam["joinTime"]) findParam["joinTime"] = {};
findParam["joinTime"]["$lt"] = joinEndTime;
isSelectUser = true;
if (!itemParam["joinTime"]) itemParam["joinTime"] = {};
itemParam["joinTime"]["$lt"] = joinEndTime;
}
if (memberLevel.length) findParam.memberLevel = {"$in":memberLevel};
if (memberLevel && memberLevel.length) {
isSelectUser = true;
itemParam.memberLevel = {"$in":memberLevel};
}
if (isSelectUser) {
let checkUserIdDataList = await find(TABLEENUM.用户表, itemParam, ["userId"]);
checkUserIdDataList.forEach(key => {
checkUserIdList.push(key.userId);
});
}
if (checkUserIdList.length) {
findParam.userId = {"$in":checkUserIdList}
}
if (phone) findParam.phone = phone;
if (paymentType) findParam.paymentMethod = paymentType;
if (costType) findParam.isFirst = costType == COSTTYPE.首次;
......@@ -368,7 +394,7 @@ export async function outPutConfirmReceipt({exportColumns}) {
}
}
if (key == "orderCycle") value = `${moment(info.orderCycleStart).format("YYYY-MM-DD")}至${moment(info.orderCycleEnd).format("YYYY-MM-DD")}`;
if (value) {
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 == "memberLevel") value = changeEnumValue(MEMBERLEVEL, value);
......@@ -427,30 +453,55 @@ export async function billStateList({name, memberType, documentId, phone, mail,
invoiceStatus:INVOICESTATUS.未开发票
};
/**用户表查询条件 */
let checkUserIdList = []
let itemParam:any = {};
let isSelectUser = false;
if (name) {
findParam["$or"] = [
{unitName:{"$regex":`${name}`}, memberType:MEMBERTYPE.单位会员},
{name:{"$regex":`${name}`}, memberType:MEMBERTYPE.个人会员}
]
isSelectUser = true;
itemParam = {
"$or":[
{unitName:{"$regex":`${name}`}},
{name:{"$regex":`${name}`}}
]
}
}
if (memberType && memberType.length) {
if (memberType < UNITMEMBERTYPE.院校) {
findParam.individualMemberType = {"$in":memberType};
} else {
findParam.unitMemberType = {"$in":memberType};
}
isSelectUser = true;
itemParam["$or"] = [ {unitMemberType:{"$in":memberType}}, {individualMemberType:{"$in":memberType}} ];
}
if (documentId) {
isSelectUser = true;
itemParam.documentId = documentId;
}
if (mail) {
isSelectUser = true;
itemParam.mail = mail;
}
if (documentId) findParam.documentId = documentId;
if (phone) findParam.phone = phone;
if (mail) findParam.mail = mail;
if (joinStartTime) {
findParam["joinTime"] = {"$gt":joinStartTime};
isSelectUser = true;
itemParam["joinTime"] = {"$gt":joinStartTime};
}
if (joinEndTime) {
if (!findParam["joinTime"]) findParam["joinTime"] = {};
findParam["joinTime"]["$lt"] = joinEndTime;
isSelectUser = true;
if (!itemParam["joinTime"]) itemParam["joinTime"] = {};
itemParam["joinTime"]["$lt"] = joinEndTime;
}
if (memberLevel && memberLevel.length) {
isSelectUser = true;
itemParam.memberLevel = {"$in":memberLevel};
}
if (memberLevel.length) findParam.memberLevel = {"$in":memberLevel};
if (isSelectUser) {
let checkUserIdDataList = await find(TABLEENUM.用户表, itemParam, ["userId"]);
checkUserIdDataList.forEach(key => {
checkUserIdList.push(key.userId);
});
}
if (checkUserIdList.length) {
findParam.userId = {"$in":checkUserIdList}
}
if (phone) findParam.phone = phone;
if (paymentType) {
eccEnumValue("发票列表", "支付类型", PAYMENTTYPE, paymentType);
findParam.paymentMethod = paymentType;
......@@ -590,7 +641,7 @@ export async function backInvoice({id}) {
// if (key == "payTime") {
// if (info.paymentMethod != PAYMENTTYPE.微信支付) value = "-"
// }
if (value) {
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 == "memberLevel") value = changeEnumValue(MEMBERLEVEL, value);
......@@ -680,30 +731,56 @@ export async function invoicedList({name, memberType, documentId, phone, mail, j
let findParam:any = {
invoiceStatus:INVOICESTATUS.已开发票
};
/**用户表查询条件 */
let checkUserIdList = []
let itemParam:any = {};
let isSelectUser = false;
if (name) {
findParam["$or"] = [
{unitName:{"$regex":`${name}`}, memberType:MEMBERTYPE.单位会员},
{name:{"$regex":`${name}`}, memberType:MEMBERTYPE.个人会员}
]
isSelectUser = true;
itemParam = {
"$or":[
{unitName:{"$regex":`${name}`}},
{name:{"$regex":`${name}`}}
]
}
}
if (memberType && memberType.length) {
if (memberType < UNITMEMBERTYPE.院校) {
findParam.individualMemberType = {"$in":memberType};
} else {
findParam.unitMemberType = {"$in":memberType};
}
isSelectUser = true;
itemParam["$or"] = [ {unitMemberType:{"$in":memberType}}, {individualMemberType:{"$in":memberType}} ];
}
if (documentId) {
isSelectUser = true;
itemParam.documentId = documentId;
}
if (mail) {
isSelectUser = true;
itemParam.mail = mail;
}
if (documentId) findParam.documentId = documentId;
if (phone) findParam.phone = phone;
if (mail) findParam.mail = mail;
if (joinStartTime) {
findParam["joinTime"] = {"$gt":joinStartTime};
isSelectUser = true;
itemParam["joinTime"] = {"$gt":joinStartTime};
}
if (joinEndTime) {
if (!findParam["joinTime"]) findParam["joinTime"] = {};
findParam["joinTime"]["$lt"] = joinEndTime;
isSelectUser = true;
if (!itemParam["joinTime"]) itemParam["joinTime"] = {};
itemParam["joinTime"]["$lt"] = joinEndTime;
}
if (memberLevel && memberLevel.length) {
isSelectUser = true;
itemParam.memberLevel = {"$in":memberLevel};
}
if (isSelectUser) {
let checkUserIdDataList = await find(TABLEENUM.用户表, itemParam, ["userId"]);
checkUserIdDataList.forEach(key => {
checkUserIdList.push(key.userId);
});
}
if (checkUserIdList.length) {
findParam.userId = {"$in":checkUserIdList}
}
if (memberLevel && memberLevel.length) findParam.memberLevel = {"$in":memberLevel};
if (phone) findParam.phone = phone;
if (paymentType) findParam.paymentMethod = paymentType;
if (isPay) findParam.state = isPay
......@@ -780,7 +857,7 @@ export async function invoicedList({name, memberType, documentId, phone, mail, j
}
}
if (key == "orderCycle") value = `${moment(info.orderCycleStart).format("YYYY-MM-DD")}至${moment(info.orderCycleEnd).format("YYYY-MM-DD")}`;
if (value) {
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 == "memberLevel") value = changeEnumValue(MEMBERLEVEL, value);
......@@ -926,17 +1003,20 @@ export async function orderList({userId, type}) {
/**
* 个人页申请开发票(提前开票)
* 个人页申请开发票
* @param id 会员缴费列表返回的id
* @param newUscc 社会信用代码
* @param newUnitName 发票抬头
*/
export async function applicationInvoice({id, memberType, newUscc, newUnitName}) {
let orderInfo = await findOnce(TABLEENUM.订单表, {id}, ["id", "invoiceStatus", "advanceInvoice", "invoiceAdd", "state", "advanceInvoice"]);
return successResult();
let orderInfo = await findOnce(TABLEENUM.订单表, {id}, ["id", "userId", "invoiceStatus", "advanceInvoice", "invoiceAdd", "state", "advanceInvoice"]);
if (!orderInfo || !orderInfo.id) throw new BizError(ERRORENUM.目标数据不存在);
if (orderInfo.invoiceStatus == INVOICESTATUS.已开发票) throw new BizError(ERRORENUM.发票已开具不可重复提交);
if (orderInfo.invoiceStatus == INVOICESTATUS.退回) throw new BizError(ERRORENUM.请求已被退回请重新申请);
// let orderInfo = await findOnce(TABLEENUM.订单表, {id}, ["userId", "memberType"]);
let updateInfo:any = {};
//个人会员申请发票锁定文字，无法修改
if (memberType == MEMBERTYPE.单位会员) {
......@@ -950,15 +1030,26 @@ export async function applicationInvoice({id, memberType, newUscc, newUnitName})
return successResult();
}
/**
* 开发票
* @param param0
* @returns
*/
export async function applicationInadvanceInvoice({id, mail, desc}) {
let orderInfo = await findOnce(TABLEENUM.订单表, {id}, ["id", "userId"]);
let orderInfo = await findOnce(TABLEENUM.订单表, {id}, ["id", "userId", "state"]);
if (!orderInfo || !orderInfo.id) throw new BizError(ERRORENUM.目标数据不存在);
if (orderInfo.invoiceStatus == INVOICESTATUS.已开发票) throw new BizError(ERRORENUM.发票已开具不可重复提交);
if (orderInfo.invoiceStatus == INVOICESTATUS.退回) throw new BizError(ERRORENUM.请求已被退回请重新申请);
let userInfo = await findOnce(TABLEENUM.用户表, {userId:orderInfo.userId}, ["userId", "unitMemberType"]);
if (userInfo.unitMemberType != UNITMEMBERTYPE.院校) {
throw new BizError(ERRORENUM.不可以提前下载发票);
let userInfo = await findOnce(TABLEENUM.用户表, {userId:orderInfo.userId}, ["userId", "unitMemberType", "memberType"]);
if (userInfo.memberType != MEMBERTYPE.单位会员) {
throw new BizError(ERRORENUM.发票已发送至邮请注意查看);
}else if (orderInfo.state == ORDERSTATE.未支付 && userInfo.unitMemberType != UNITMEMBERTYPE.院校) {
throw new BizError(ERRORENUM.请先付款后进行发票操作);
}
let updateInfo = {
invoiceMail:mail,
desc:desc,
......@@ -971,21 +1062,24 @@ export async function applicationInadvanceInvoice({id, mail, desc}) {
return successResult();
}
export async function applicationInadvanceInvoiceInfo({id}) {
let orderInfo = await findOnce(TABLEENUM.订单表, {id}, ["id", "userId", "invoiceMail", "desc", "isSueInvoicesInAdvance", "invoiceStatus"]);
let orderInfo = await findOnce(TABLEENUM.订单表, {id}, ["id", "userId", "invoiceMail", "desc", "invoiceStatus", "state"]);
if (!orderInfo || !orderInfo.id) throw new BizError(ERRORENUM.目标数据不存在);
if (!orderInfo.isSueInvoicesInAdvance) {
throw new BizError(ERRORENUM.请先提供发票信息);
}
let userInfo = await findOnce(TABLEENUM.用户表, {userId:orderInfo.userId}, ["userId", "unitMemberType"]);
if (userInfo.unitMemberType != UNITMEMBERTYPE.院校) {
throw new BizError(ERRORENUM.不可以提前下载发票);
let userInfo = await findOnce(TABLEENUM.用户表, {userId:orderInfo.userId}, ["userId", "memberType", "mail", "unitMemberType"]);
if (userInfo.memberType != MEMBERTYPE.单位会员) {
throw new BizError(ERRORENUM.发票已发送至邮请注意查看);
}else if (orderInfo.state == ORDERSTATE.未支付 && userInfo.unitMemberType != UNITMEMBERTYPE.院校) {
throw new BizError(ERRORENUM.请先付款后进行发票操作);
}
return {
invoiceMail:orderInfo.invoiceMail,
desc:orderInfo.desc,
};
let resultObj = {
invoiceMail: orderInfo.invoiceMail || userInfo.mail || "",
desc:orderInfo.desc || ""
}
return resultObj;
}
......@@ -1140,10 +1234,27 @@ export async function accountInfo({id, form}) {
* 退款列表
* @param param0
*/
export async function refundList({pageNumber}) {
export async function refundList({name, pageNumber}) {
let findParam:any = {
isReceive:ISRECEIVE.提供账户_zkh需退款_ykh
};
let checkUserIdList = []
if (name) {
let itemParam = {
"$or":[
{unitName:{"$regex":`${name}`}},
{name:{"$regex":`${name}`}}
]
}
let checkUserIdDataList = await find(TABLEENUM.用户表, itemParam, ["userId"]);
checkUserIdDataList.forEach(key => {
checkUserIdList.push(key.userId);
});
}
if (checkUserIdList.length) {
findParam.userId = {"$in":checkUserIdList}
}
let selectFile = ["id", "unitName", "orderCycleStart", "orderCycleEnd", "money", "memberCategory", "userId", "refundBankCarId", "refundBankName", "refundSuccessful", "isReplenishReturnInfo" ];
let dbList = await findToPage(TABLEENUM.订单表, findParam, selectFile, pageNumber);
......@@ -1245,7 +1356,7 @@ export async function refundApprove({id, refundImgUrl}) {
}
}
if (key == "orderCycle") value = `${moment(info.orderCycleStart).format("YYYY-MM-DD")}至${moment(info.orderCycleEnd).format("YYYY-MM-DD")}`;
if (value) {
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 == "memberLevel") value = changeEnumValue(MEMBERLEVEL, value);
......
src/config/errorEnum.ts
......@@ -75,7 +75,9 @@ export enum ERRORENUM {
账号不存在,
密码修改错误,
非单位会员不可操作,
不存在审批历史
不存在审批历史,
发票已发送至邮请注意查看,
请先付款后进行发票操作
}
export enum ERRORCODEENUM {
......
src/data/models/model.ts
......@@ -519,7 +519,7 @@ const ModelArray = [
refundSuccessful:{type:"Boolean", default:false},//退款确认
refundImgUrl:"String",
//新加的状态
isSueInvoicesInAdvance:{type:"Boolean", default:false},//提前开票
isSueInvoicesInAdvance:{type:"Boolean", default:false},//提前开票 弃用
}
},
{
......
src/routers/member/router.ts
......@@ -343,7 +343,7 @@ export const Config = {
subUrl:'/changepwd',
notMiddleware:true,
param:[
{key:"userId", type:"String", desc:"userId", notMustHave:true},
{key:"userId", type:"String", desc:"userId", isNull:true},
{key:"phone", type:"String", desc:"绑定手机号"},
{key:"pwd", type:"String", desc:"密码"},
{key:"confirmation", type:"String", desc:"二次确认密码"},
......@@ -355,7 +355,7 @@ export const Config = {
subUrl:'/getchangepwdcode',
notMiddleware:true,
param:[
{key:"userId", type:"String", desc:"userId", notMustHave:true},
{key:"userId", type:"String", desc:"userId", isNull:true},
{key:"phone", type:"String", desc:"绑定手机号"}
],
bindBiz:userBiz.memberChangePwdSendCode
......
src/routers/order/router.ts
......@@ -202,6 +202,7 @@ export const Config = {
apiName:"退款列表",
subUrl:'/order/refundlist',
param:[
{key:"name", type:"String", desc:"名称", isNull:true},
{key:"pageNumber", type:"Number", desc:"当前页"},
],
bindBiz:orderBiz.refundList
......@@ -260,19 +261,19 @@ export const Config = {
],
bindBiz:orderBiz.reconfirm
},
// {
// apiName:"申请发票", 弃用统一成下面的
// subUrl:'/order/applicationinvoice',
// param:[
// {key:"id", type:"String", desc:"会员缴费列表返回id"},
// {key:"memberType", type:"Number", desc:"会员类型"},
// {key:"newUscc", type:"String", desc:"新的社会信用代码", isNull:true},
// {key:"newUnitName", type:"String", desc:"新的发票抬头", isNull:true}
// ],
// bindBiz:orderBiz.applicationInvoice
// },
{
apiName:"申请发票",
subUrl:'/order/applicationinvoice',
param:[
{key:"id", type:"String", desc:"会员缴费列表返回id"},
{key:"memberType", type:"Number", desc:"会员类型"},
{key:"newUscc", type:"String", desc:"新的社会信用代码", isNull:true},
{key:"newUnitName", type:"String", desc:"新的发票抬头", isNull:true}
],
bindBiz:orderBiz.applicationInvoice
},
{
apiName:"提前开发票",
apiName:"开发票",
subUrl:'/order/inadvance',
param:[
{key:"id", type:"String", desc:"会员缴费列表返回id"},
......@@ -282,7 +283,7 @@ export const Config = {
bindBiz:orderBiz.applicationInadvanceInvoice
},
{
apiName:"提前开发票回显",
apiName:"开发票回显",
subUrl:'/order/inadvanceinfo',
param:[
{key:"id", type:"String", desc:"会员缴费列表返回id"}
......
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