Commit 6bb9c240 by 王昆

gsb

parent 4ad6faf6
...@@ -50,6 +50,12 @@ class ActionAPI extends APIBase { ...@@ -50,6 +50,12 @@ class ActionAPI extends APIBase {
case "orderPay": case "orderPay":
opResult = await this.storderSve.pay(action_body); opResult = await this.storderSve.pay(action_body);
break; break;
case "orderAudit1":
opResult = await this.storderSve.audit1(action_body);
break;
case "orderAudit2":
opResult = await this.storderSve.audit2(action_body);
break;
case "itemPage": case "itemPage":
opResult = await this.storderitemSve.pageByCondition(action_body); opResult = await this.storderitemSve.pageByCondition(action_body);
......
...@@ -39,7 +39,7 @@ class StOrderService extends ServiceBase { ...@@ -39,7 +39,7 @@ class StOrderService extends ServiceBase {
async info(params) { async info(params) {
let order = await this.dao.getById(params.id); let order = await this.dao.getById(params.id);
if(!order) { if (!order) {
return system.getResult(null, "订单不存在"); return system.getResult(null, "订单不存在");
} }
this.handleDate(order, ["created_at"], null); this.handleDate(order, ["created_at"], null);
...@@ -116,50 +116,67 @@ class StOrderService extends ServiceBase { ...@@ -116,50 +116,67 @@ class StOrderService extends ServiceBase {
if (pay_bank_no) { if (pay_bank_no) {
order.pay_bank_no = pay_bank_no; order.pay_bank_no = pay_bank_no;
} }
// 一审
order.check_status = "01";
await order.save(); await order.save();
return system.getResultSuccess(); return system.getResultSuccess();
} }
// 详情
// 保存打款信息
// 付款申请提交
// 一审 // 一审
async audit1(params) {
let _params = {
id: this.trim(params.id),
pre: "01",
status: Number(params.status || 0) == 1 ? "03" : "02",
remark: params.remark,
auditType: 1
}
return await this.doAudit(_params);
}
// 二审 // 二审
async audit2(params) {
let _params = {
id: this.trim(params.id),
pre: "03",
status: Number(params.status || 0) == 1 ? "05" : "04",
remark: params.remark,
auditType: 2
}
return await this.doAudit(_params);
}
// 打款 async doAudit(params) {
let id = this.trim(params.id);
// 结果反馈-批量 let pre = this.trim(params.pre);
let status = params.status;
let remark = this.trim(params.remark);
let auditType = params.auditType;
async page(params) { let auditName = auditType === 1 ? "一审" : "二审";
let currentPage = Number(params.currentPage || 1); remark = this.trim(remark);
let pageSize = Number(params.pageSize || 10); if (!remark) {
return system.getResult(null, `请填写${auditName}备注`);
}
let where = {}; let order = await this.dao.findById(id);
if (params.id) { this.dictionary.setRowName("ORDER", order, ["check_status"]);
where.id = this.trim(params.id); if (!order) {
return system.getResult(null, "订单不存在");
} }
if (params.name) { if (order.check_status !== pre) {
where.name = this.trim(params.name); return system.getResult(null, `${auditName}失败,当前状态为[${order.check_status_name}]`);
} }
let orderby = [
["id", 'desc']
];
let page = await this.getPageList(currentPage, pageSize, where, orderby, null); order[`check${auditType}_remark`] = remark;
if (page && page.rows) { order.check_status = status;
for (var row of page.rows) { await order.save();
this.handleDate(row, ["created_at"], null, -8); return system.getResultSuccess();
}
await this.setUser(page.rows);
}
return system.getResultSuccess(page);
} }
// 打款
// 结果反馈-批量
} }
module.exports = StOrderService; module.exports = StOrderService;
......
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