Skip to content

W
wenHuaBu_adminServer
Commit c146e20c by lixinming
Options

no message

parent 1d4173a0
Showing with 75 additions and 14 deletions
src/biz/member/order.ts
......@@ -2,7 +2,7 @@
* 订单相关 success
*/
import moment = require("moment");
import { AUDITINGCLIENT, COSTTYPE, INDIVIDUALMEMBERTYPE, INVOICESTATUS, ISPAYENUM, MEMBERLEVEL, MEMBERSTATE, MEMBERTYPE, MYORDERLISTPAYSTATE, MYORDERLISTSTATE, OPERATIONREHAVIOR, ORDERSTATE, PAYMENTSTATUS, PAYMENTTYPE, RECEIPTCONFIRMATION, STATE, UNITMEMBERTYPE } from "../../config/enum";
import { AUDITINGCLIENT, COSTTYPE, INDIVIDUALMEMBERTYPE, INVOICESTATUS, ISPAYENUM, ISRECEIVE, MEMBERLEVEL, MEMBERSTATE, MEMBERTYPE, MYORDERLISTPAYSTATE, MYORDERLISTSTATE, OPERATIONREHAVIOR, 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";
......@@ -277,14 +277,15 @@ export async function confirmReceiptPass({id}) {
* 发票管理-财务核对页-收款退回 success
* @param param0
*/
export async function confirmReceiptOut({id}) {
export async function confirmReceiptOut({id, isReceive, returnsReasons}) {
eccEnumValue("收款退回", "是否收到款项", ISRECEIVE, isReceive)
let orderInfo = await findOnce(TABLEENUM.订单表, {id});
if (!orderInfo || !orderInfo.id ) throw new BizError(ERRORENUM.目标数据不存在);
// if (orderInfo.isFirst && !orderInfo.firstPayExamine ) throw new BizError(ERRORENUM.重复提交, '发票管理-财务核对页-收款确认', `提交通过时订单未通过待支付页的校验`);
if (orderInfo.confirmReceipt != RECEIPTCONFIRMATION.待确认) throw new BizError(ERRORENUM.重复提交, '发票管理-财务核对页-收款确认', `提交通过时订单已经不是待确认 是${orderInfo.confirmReceipt}`);
if (orderInfo.paymentMethod == PAYMENTTYPE.微信支付) throw new BizError(ERRORENUM.微信支付无法被退回);
let updateInfo:any = {confirmReceipt:RECEIPTCONFIRMATION.退回};
let updateInfo:any = {confirmReceipt:RECEIPTCONFIRMATION.退回, returnsReasons, isReceive};
if (orderInfo.isFirst == true) {
updateInfo.firstPayExamine = false;
}
......@@ -531,7 +532,7 @@ export async function orderList({userId, type}) {
if (type == ORDERSTATE.已支付) findParam.state = ORDERSTATE.已支付;
else if (type == ORDERSTATE.未支付) findParam.state = ORDERSTATE.未支付;
const SelectFile = ["orderCycleStart", "orderCycleEnd", "money", "state", "id", "advanceInvoice", "invoiceStatus", "unitName", "confirmReceipt", "newUscc"];
const SelectFile = ["orderCycleStart", "orderCycleEnd", "money", "state", "id", "advanceInvoice", "invoiceStatus", "unitName", "confirmReceipt", "newUscc", "isReceive", "isReplenishReturnInfo"];
let dbList = await find(TABLEENUM.订单表, findParam, SelectFile);
/**查询证明函需要字段会员等级 */
let myOldInfo = await findOnce(TABLEENUM.用户表, {userId}, ["memberLevel", "userId", "uscc", "memberType"]);
......@@ -540,7 +541,7 @@ export async function orderList({userId, type}) {
let dataList = [];
dbList.forEach(info => {
let {orderCycleStart, orderCycleEnd, money, state, id, unitName, confirmReceipt, newUscc} = info;
let {orderCycleStart, orderCycleEnd, money, state, id, unitName, confirmReceipt, newUscc, isReceive, isReplenishReturnInfo} = info;
let payState;
if (state == ORDERSTATE.已支付) {
if (!confirmReceipt) {/**首次支付 待确认未审核*/
......@@ -550,7 +551,16 @@ export async function orderList({userId, type}) {
} else if (confirmReceipt == RECEIPTCONFIRMATION.收款确认) {
payState = MYORDERLISTPAYSTATE.已缴费
} else {
payState = MYORDERLISTPAYSTATE.缴费失败
if ( isReceive == ISRECEIVE.提供账户_zkh需退款_ykh ) {
if (!isReplenishReturnInfo) {
payState = MYORDERLISTPAYSTATE.退款通知
} else if (isReplenishReturnInfo ) {//todo 这里还要加一个条件
payState = MYORDERLISTPAYSTATE.退款成功
}
} else {
payState = MYORDERLISTPAYSTATE.缴费失败
}
}
} else {
payState = MYORDERLISTPAYSTATE.待缴费
......@@ -690,6 +700,13 @@ export async function getInvoiceStatus({id}) {
}
export async function reasonInfo({id}) {
let orderInfo = await findOnce(TABLEENUM.订单表, {id});
if (!orderInfo || !orderInfo.id) throw new BizError(ERRORENUM.目标数据不存在);
if ( orderInfo.confirmReceipt != RECEIPTCONFIRMATION.退回) throw new BizError(ERRORENUM.该订单未被退回);
}
......
src/biz/public.ts
......@@ -19,6 +19,9 @@ export function setEnumInterface({defaultParam}) {
if(/_ju/.test(keyStr)) keyStr = keyStr.replace(/_ju/, "。");
if(/_hgh/.test(keyStr)) keyStr = keyStr.replace(/_hgh/, "-");
if(/_kbh/.test(keyStr)) keyStr = keyStr.replace(/_kbh/, "");
if(/_zkh/.test(keyStr)) keyStr = keyStr.replace(/_zkh/, "（");
if(/_ykh/.test(keyStr)) keyStr = keyStr.replace(/_ykh/, "）");
if(/_xg/.test(keyStr)) keyStr = keyStr.replace(/_xg/, "/");
dataList.push({key:keyStr, value});
}
}
......@@ -58,6 +61,9 @@ export async function filePosition() {
if(/_ju/.test(keyStr)) keyStr = keyStr.replace(/_ju/, "。");
if(/_hgh/.test(keyStr)) keyStr = keyStr.replace(/_hgh/, "-");
if(/_kbh/.test(keyStr)) keyStr = keyStr.replace(/_kbh/, "");
if(/_zkh/.test(keyStr)) keyStr = keyStr.replace(/_zkh/, "（");
if(/_ykh/.test(keyStr)) keyStr = keyStr.replace(/_ykh/, "）");
if(/_xg/.test(keyStr)) keyStr = keyStr.replace(/_xg/, "/");
dataList.push({key:keyStr, value});
}
}
......
src/config/enum.ts
......@@ -629,7 +629,9 @@ export enum MYORDERLISTPAYSTATE {
待缴费 = 1,
已缴费,
财务查账中,
缴费失败
缴费失败,
退款通知,
退款成功
}
/**
......@@ -729,3 +731,10 @@ export enum CLIENTACTIVITYSTATE {
已参加,
}
/**
* 是否受到款项
*/
export enum ISRECEIVE {
未收到款项_xg其他 = 1,
提供账户_zkh需退款_ykh
}
\ No newline at end of file
src/data/models/model.ts
......@@ -441,9 +441,9 @@ const ModelArray = [
/**标签管理 */
lableId:{type:'[String]', default:[]},//标签id 外键
/**黑名单 */
isBlackUser:{type:'Number', default:STATE.否},//是否黑名单用户 0：否， 1：是
isBlackUser:{type:'Number', default:STATE.否},//是否黑名单用户 0：否， 1：是 STATE
/**注册第二步保存未提交 */
saveUnsubmitted:{type:'Number', default:STATE.否},//是否提交注册完成 0：否， 1：是
saveUnsubmitted:{type:'Number', default:STATE.否},//是否提交注册完成 0：否， 1：是 STATE
firstStep:'Number',//第一步完成时间
}
},
......@@ -483,7 +483,7 @@ const ModelArray = [
isFirst:{type:'Boolean', default:true},//首次订单
state:'Number',//状态 是否支付 枚举 ORDERSTATE
paymentMethod:'Number',//付款方式 枚举 PAYMENTTYPE
firstPayExamine:{type:'Boolean', default:false},//首次订单的审批开关【待支付页审批开关】
firstPayExamine:{type:'Boolean', default:false},//首次订单的审批开关【待支付页审批开关】
confirmReceipt:{type:'Number', default:0},//收款确认【财务核对页收款确认】 RECEIPTCONFIRMATION
invoiceStatus:{type:'Number', default:INVOICESTATUS.不具备开票条件, index:true},//发票状态 枚举 INVOICESTATUS 【待开发票页上传发票之后更新状态】
advanceInvoice:{type:'Boolean', default:false},//是否提交开票 【个人列表页提交开发票按钮】
......@@ -494,6 +494,10 @@ const ModelArray = [
//2.0新加
invoiceMail:'String',//发票邮箱
desc:'String',//描述
isReceive:{type:"Number"},//退回理由中的是否受到款项【财务核对页收款退回】 ISRECEIVE
returnsReasons:'String',//退回理由中的退回理由描述【财务核对页收款退回】
isReplenishReturnInfo:{type:'Boolean', default:false},//是否补充退款信息
}
},
{
......
src/routers/order/router.ts
......@@ -84,7 +84,9 @@ export const Config = {
apiName:"财务核对-退回",
subUrl:'/order/invoice/examine/out',
param:[
{key:"id", type:"String", desc:"订单id"}
{key:"id", type:"String", desc:"订单id"},
{key:"isReceive", type:"Number", desc:"是否受到款项"},
{key:"returnsReasons", type:"String", desc:"退回理由"}
],
bindBiz:orderBiz.confirmReceiptOut
},
......@@ -196,6 +198,22 @@ export const Config = {
],
bindBiz:orderBiz.getInvoiceStatus
},
{
apiName:"退款原因回显",
subUrl:'/order/refund/reasoninfo',
param:[
{key:"id", type:"String", desc:"会员缴费列表返回id"},
],
bindBiz:orderBiz.
},
{
apiName:"退款信息",
subUrl:'/order/refund/accountinfo',
param:[
{key:"id", type:"String", desc:"会员缴费列表返回id"},
],
bindBiz:orderBiz.
},
],
}
src/routers/public/router.ts
......@@ -295,7 +295,13 @@ export const Config = {
defaultParam:enumConfig.ACTIVITYTYPE,
bindBiz:publicBiz.setEnumInterface
},
{
apiName:"是否受到款项",
subUrl:'/isreceive',
param:[],
defaultParam:enumConfig.ISRECEIVE,
bindBiz:publicBiz.setEnumInterface
}
],
}
src/routers/router.ts
......@@ -29,9 +29,9 @@ export async function setRouter(httpServer){
await getDoc();
// await initDoc(portalRouter.FirstName, portalRouter.Config, portalRouter.FirstRouter);//网站编辑
await initDoc(publicRouter.FirstName, publicRouter.Config, publicRouter.FirstRouter);//公用组件
await initDoc(memberRouter.FirstName, memberRouter.Config, memberRouter.FirstRouter);//用户路由
// await initDoc(memberRouter.FirstName, memberRouter.Config, memberRouter.FirstRouter);//用户路由
// await initDoc(officalWebsiteRouter.FirstName, officalWebsiteRouter.Config, officalWebsiteRouter.FirstRouter);//官网路由
// await initDoc(orderRouter.FirstName, orderRouter.Config, orderRouter.FirstRouter);//会费相关
await initDoc(orderRouter.FirstName, orderRouter.Config, orderRouter.FirstRouter);//会费相关
// await initDoc(costRouter.FirstName, costRouter.Config, costRouter.FirstRouter);//支付
// await initDoc(outPutRouter.FirstName, outPutRouter.Config, outPutRouter.FirstRouter);//导出路由
// await initDoc(labelRouter.FirstName, labelRouter.Config, labelRouter.FirstRouter);//标签路由
......
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