Commit 20690538 by 宋毅

tj

parent 0b115482
...@@ -37,6 +37,12 @@ class OrderAPI extends APIBase { ...@@ -37,6 +37,12 @@ class OrderAPI extends APIBase {
case "getOrderDeliveryFlowInfo"://获取订单交付流程信息 case "getOrderDeliveryFlowInfo"://获取订单交付流程信息
opResult = await this.orderinfoSve.getOrderDeliveryFlowInfo(pobj, pobj.actionBody); opResult = await this.orderinfoSve.getOrderDeliveryFlowInfo(pobj, pobj.actionBody);
break; break;
case "getOrderDeliveryFlowList"://获取订单交付流程列表信息
opResult = await this.orderinfoSve.getOrderDeliveryFlowList(pobj, pobj.actionBody);
break;
case "getOrderLogInfo"://获取订单日志信息
opResult = await this.orderinfoSve.getOrderLogInfo(pobj, pobj.actionBody);
break;
//--------------------------------支付相关接口------------开始 //--------------------------------支付相关接口------------开始
case "getPayOrderInfo"://获取付款订单信息 case "getPayOrderInfo"://获取付款订单信息
opResult = await this.orderinfoSve.getPayOrderInfo(pobj, pobj.actionBody); opResult = await this.orderinfoSve.getPayOrderInfo(pobj, pobj.actionBody);
......
...@@ -4,5 +4,18 @@ class FlowLogDao extends Dao { ...@@ -4,5 +4,18 @@ class FlowLogDao extends Dao {
constructor() { constructor() {
super(Dao.getModelName(FlowLogDao)); super(Dao.getModelName(FlowLogDao));
} }
async getlogListBySourceOrderNo(sourceOrderNo) {
return await this.model.findAll({
where: {
sourceOrderNo: sourceOrderNo,
isShow: 1
},
order: [["id", 'desc']],
attributes: [
"opContent",
"created_at"],
raw: true
});
}
} }
module.exports = FlowLogDao; module.exports = FlowLogDao;
...@@ -11,6 +11,7 @@ class OrderInfoDao extends Dao { ...@@ -11,6 +11,7 @@ class OrderInfoDao extends Dao {
}, },
attributes: [ attributes: [
"id", "id",
"uapp_id",
"orderNo", "orderNo",
"channelServiceNo", "channelServiceNo",
"channelOrderNo", "channelOrderNo",
......
...@@ -5,11 +5,12 @@ const uuidv4 = require('uuid/v4'); ...@@ -5,11 +5,12 @@ const uuidv4 = require('uuid/v4');
class OrderInfoService extends ServiceBase { class OrderInfoService extends ServiceBase {
constructor() { constructor() {
super("dbcorder", ServiceBase.getDaoName(OrderInfoService)); super("dbcorder", ServiceBase.getDaoName(OrderInfoService));
this.flowlogDao = system.getObject("db.dbcorder.flowlogDao");
this.orderproductDao = system.getObject("db.dbcorder.orderproductDao"); this.orderproductDao = system.getObject("db.dbcorder.orderproductDao");
this.ordercontactsDao = system.getObject("db.dbcorder.ordercontactsDao"); this.ordercontactsDao = system.getObject("db.dbcorder.ordercontactsDao");
this.orderReceiptVoucherDao = system.getObject("db.dbcpay.orderreceiptvoucherDao"); this.orderReceiptVoucherDao = system.getObject("db.dbcpay.orderreceiptvoucherDao");
this.moneyJourneyDao = system.getObject("db.dbcpay.moneyjourneyDao"); this.moneyJourneyDao = system.getObject("db.dbcpay.moneyjourneyDao");
this.pushlogSve = system.getObject("service.common.pushlogSve");
} }
async createOrder(pobj, orderNo, t) { async createOrder(pobj, orderNo, t) {
var actionBody = pobj.actionBody; var actionBody = pobj.actionBody;
...@@ -53,6 +54,13 @@ class OrderInfoService extends ServiceBase { ...@@ -53,6 +54,13 @@ class OrderInfoService extends ServiceBase {
opNotes: "",//varchar(255) //操作备注 opNotes: "",//varchar(255) //操作备注
}; };
var order = await this.dao.create(params, t);//创建订单 var order = await this.dao.create(params, t);//创建订单
var orderLog = {
uapp_id: pobj.appInfo.uapp_id,
sourceOrderNo: orderNo,
opContent: "您提交了订单,请及时支付",
isShow: 1
};
await this.flowlogDao.create(orderLog, t);
var orderProductObj = { var orderProductObj = {
uapp_id: pobj.appInfo.uapp_id, uapp_id: pobj.appInfo.uapp_id,
sourceOrderNo: orderNo, // 来源单号 sourceOrderNo: orderNo, // 来源单号
...@@ -343,8 +351,9 @@ class OrderInfoService extends ServiceBase { ...@@ -343,8 +351,9 @@ class OrderInfoService extends ServiceBase {
} }
async getOrderDeliveryInfo(pobj, actionBody) {//获取订单交付信息 async getOrderDeliveryInfo(pobj, actionBody) {//获取订单交付信息
var sql = "select * from c_order_delivery where sourceOrderNo='" + pobj.actionBody.orderNo + "'"; var sql = "select * from c_order_delivery where sourceOrderNo=:sourceOrderNo";
var list = await this.customQuery(sql); var paramWhere = { sourceOrderNo: actionBody.orderNo };
var list = await this.customQuery(sql, paramWhere);
if (list && list.length > 0) { if (list && list.length > 0) {
if (list[0].deliveryContent) { if (list[0].deliveryContent) {
return system.getResultSuccess(list[0].deliveryContent); return system.getResultSuccess(list[0].deliveryContent);
...@@ -354,8 +363,9 @@ class OrderInfoService extends ServiceBase { ...@@ -354,8 +363,9 @@ class OrderInfoService extends ServiceBase {
} }
async getOrderDeliveryFlowInfo(pobj, actionBody) {//获取订单交付流程信息 async getOrderDeliveryFlowInfo(pobj, actionBody) {//获取订单交付流程信息
var sql = "select * from c_delivery_official_flow where sourceOrderNo='" + pobj.actionBody.sourceOrderNo + "'"; var sql = "select * from c_delivery_official_flow where sourceOrderNo=:sourceOrderNo";
var list = await this.customQuery(sql); var paramWhere = { sourceOrderNo: actionBody.sourceOrderNo };
var list = await this.customQuery(sql, paramWhere);
if (list && list.length > 0) { if (list && list.length > 0) {
if (list[0].officialFlow) { if (list[0].officialFlow) {
return system.getResultSuccess(list[0].officialFlow); return system.getResultSuccess(list[0].officialFlow);
...@@ -363,6 +373,28 @@ class OrderInfoService extends ServiceBase { ...@@ -363,6 +373,28 @@ class OrderInfoService extends ServiceBase {
} }
return system.getResultSuccess(); return system.getResultSuccess();
} }
async getOrderDeliveryFlowList(pobj, actionBody) {//获取订单交付流程列表信息
var sql = "select * from c_delivery_official_flow where sourceOrderNo IN(:sourceOrderNo)";
var paramWhere = { sourceOrderNo: actionBody.sourceOrderNoList };
var list = await this.customQuery(sql, paramWhere);
var tmpList = [];
if (list && list.length > 0) {
for (let index = 0; index < list.length; index++) {
const element = list[index];
if (element.officialFlow) {
tmpList.push({
sourceOrderNo: element.sourceOrderNo,
flowList: element.officialFlow
});
}
}
}
return system.getResultSuccess(tmpList);
}
async getOrderLogInfo(pobj, actionBody) {//获取订单日志信息
var list = await this.flowlogDao.getlogListBySourceOrderNo(actionBody.sourceOrderNo);
return system.getResultSuccess(list);
}
//-------------------------------服务商通知订单流程-------------start---------------- //-------------------------------服务商通知订单流程-------------start----------------
async icOrderStatusNotify(pobj, actionBody) {//峰擎通知工商办理状态 async icOrderStatusNotify(pobj, actionBody) {//峰擎通知工商办理状态
...@@ -413,6 +445,14 @@ class OrderInfoService extends ServiceBase { ...@@ -413,6 +445,14 @@ class OrderInfoService extends ServiceBase {
updated: actionBody.updated updated: actionBody.updated
}); });
} }
var orderLog = {
uapp_id: item.uapp_id,
sourceOrderNo: actionBody.orderNo,
created_at: actionBody.updated,
opContent: "您的订单办理流程更新为【" + updateDeliveryInfo.orderDeliveryStatusName + "】",
isShow: 1
};
await this.flowlogDao.create(orderLog);
var sql = null; var sql = null;
if (addi > 0) { if (addi > 0) {
await this.dao.updateByWhere({ orderStatus: 4 }, { where: { id: item.id } }); await this.dao.updateByWhere({ orderStatus: 4 }, { where: { id: item.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