Skip to content

Z
zhichan
Commit f311eaee by 王昆
Options

gsb

parent 17ea6ac2
Showing with 66 additions and 4 deletions
xggsve-order/app/base/api/impl/op/action.js
...@@ -126,6 +126,12 @@ class ActionAPI extends APIBase { ...@@ -126,6 +126,12 @@ class ActionAPI extends APIBase {
case "saasOrderMicroAdd": // 小程序下单 case "saasOrderMicroAdd": // 小程序下单
opResult = await this.saasorderSve.microAdd(action_body); opResult = await this.saasorderSve.microAdd(action_body);
break; break;
case "saasOrderUpdate": // 订单信息
opResult = await this.saasorderSve.updateOrder(action_body);
break;
case "saasOrderSveDeliver": // 订单信息
opResult = await this.saasorderSve.sveDeliver(action_body);
break;
case "saasOrderInfo": // 订单信息 case "saasOrderInfo": // 订单信息
opResult = await this.saasorderSve.info(action_body); opResult = await this.saasorderSve.info(action_body);
break; break;
...@@ -150,6 +156,9 @@ class ActionAPI extends APIBase { ...@@ -150,6 +156,9 @@ class ActionAPI extends APIBase {
case "saasOrderBulkOfflinePay": // 订单信息 case "saasOrderBulkOfflinePay": // 订单信息
opResult = await this.saasorderSve.bulkOfflinePay(action_body); opResult = await this.saasorderSve.bulkOfflinePay(action_body);
break; break;
case "saasOrderBulkOfflinePay": // 订单信息
opResult = await this.saasorderSve.bulkOfflinePay(action_body);
break;
//******************************************************************** */ //******************************************************************** */
// // 订单 // // 订单
......
xggsve-order/app/base/db/models/order/oorder.js
...@@ -23,6 +23,7 @@ module.exports = function (db, DataTypes) { ...@@ -23,6 +23,7 @@ module.exports = function (db, DataTypes) {
source_no: {type: DataTypes.STRING, field: 'source_no', allowNull: true, defaultValue:'', comment:'来源订单号' }, source_no: {type: DataTypes.STRING, field: 'source_no', allowNull: true, defaultValue:'', comment:'来源订单号' },
contact_mobile: {type: DataTypes.STRING, field: 'contact_mobile', allowNull: true, defaultValue:'', comment:'联系电话' }, contact_mobile: {type: DataTypes.STRING, field: 'contact_mobile', allowNull: true, defaultValue:'', comment:'联系电话' },
customer_name: {type: DataTypes.STRING, field: 'customer_name', allowNull: true, defaultValue:'', comment:'客户名称' }, customer_name: {type: DataTypes.STRING, field: 'customer_name', allowNull: true, defaultValue:'', comment:'客户名称' },
saas_deliver_api: {type: DataTypes.STRING, field: 'saas_deliver_api', allowNull: true, defaultValue:'', comment:'saas系统状态通知api' },
created_at: { type: DataTypes.DATE, field: 'created_at', allowNull: false, defaultValue: DataTypes.NOW }, created_at: { type: DataTypes.DATE, field: 'created_at', allowNull: false, defaultValue: DataTypes.NOW },
updated_at: { type: DataTypes.DATE, field: 'updated_at', allowNull: false, defaultValue: DataTypes.NOW }, updated_at: { type: DataTypes.DATE, field: 'updated_at', allowNull: false, defaultValue: DataTypes.NOW },
deleted_at: { type: DataTypes.DATE, field: 'deleted_at', allowNull: true } deleted_at: { type: DataTypes.DATE, field: 'deleted_at', allowNull: true }
......
xggsve-order/app/base/service/impl/order/oorderSve.js
...@@ -46,6 +46,7 @@ class OorderService extends ServiceBase { ...@@ -46,6 +46,7 @@ class OorderService extends ServiceBase {
order.desc = this.trim(params.notes); order.desc = this.trim(params.notes);
order.contact_mobile = this.trim(params.contact_mobile); order.contact_mobile = this.trim(params.contact_mobile);
order.customer_name = this.trim(params.customer_name); order.customer_name = this.trim(params.customer_name);
order.saas_deliver_api = this.trim(params.saas_deliver_api);
// 验证订单是否存在 // 验证订单是否存在
let exists = await this.dao.findOne({ source_id: order.source_id, source_no: order.source_no }); let exists = await this.dao.findOne({ source_id: order.source_id, source_no: order.source_no });
...@@ -73,6 +74,7 @@ class OorderService extends ServiceBase { ...@@ -73,6 +74,7 @@ class OorderService extends ServiceBase {
order.status = orderProcessList[0].status; order.status = orderProcessList[0].status;
// 开启事务 // 开启事务
var self = this; var self = this;
let orderReg = this.buildRegInfo(params.bminfo);
await this.db.transaction(async function (t) { await this.db.transaction(async function (t) {
// 插入订单数据 // 插入订单数据
order = await self.dao.create(order, t); order = await self.dao.create(order, t);
...@@ -83,10 +85,7 @@ class OorderService extends ServiceBase { ...@@ -83,10 +85,7 @@ class OorderService extends ServiceBase {
} }
await self.oorderprocessDao.bulkCreate(orderProcessList, t); await self.oorderprocessDao.bulkCreate(orderProcessList, t);
let orderReg = { orderReg.id = order.id;
id: order.id,
// legal_mobile: order.contact_mobile,
}
await self.oorderinforegDao.create(orderReg, t); await self.oorderinforegDao.create(orderReg, t);
// return order; // return order;
}); });
...@@ -95,6 +94,33 @@ class OorderService extends ServiceBase { ...@@ -95,6 +94,33 @@ class OorderService extends ServiceBase {
return system.getResult(order); return system.getResult(order);
} }
buildRegInfo(bminfo) {
let obj = {};
if(!bminfo) {
return obj;
}
obj.legal_name = this.trim(bminfo.legal_name);
obj.id_card = this.trim(bminfo.legal_idno);
obj.legal_mobile = this.trim(bminfo.legal_mobile);
obj.names = this.trim(bminfo.company_names);
obj.domicile_id = this.trim(bminfo.domicile_id);
obj.domicile_name = this.trim(bminfo.domicile_name);
obj.business_scope_id = this.trim(bminfo.business_scope_id);
obj.business_type = this.trim(bminfo.business_type);
obj.business_scope = this.trim(bminfo.business_scope);
obj.idcard_front = this.trim(bminfo.idcard_front);
obj.idcard_back = this.trim(bminfo.idcard_back);
// 这些字段在交付系统里暂时没有
// `bank_front` '银行卡正面照片',
// `bank_back` '银行卡背面照片',
// `bank_name` '开户行',
// `bank_no` '银行卡号',
// `bank_mobile` '银行卡预留手机号',
return obj;
}
/** /**
* 查询订单信息 * 查询订单信息
* @param {*} params * @param {*} params
......
xggsve-order/app/base/service/impl/saas/saasorderSve.js
...@@ -183,6 +183,32 @@ class SaasOrderService extends ServiceBase { ...@@ -183,6 +183,32 @@ class SaasOrderService extends ServiceBase {
return system.getResultSuccess(order); return system.getResultSuccess(order);
} }
async updateOrder(params) {
if (!params.id) {
return system.getResult("订单id不存在");
}
await this.dao.update(params);
return system.getResultSuccess();
}
async sveDeliver(params) {
if (!params.id) {
return system.getResult("订单id不存在");
}
let self = this;
await this.db.transaction(async t => {
//创建orderdeliver记录
await self.dao.update({id: params.id, handle_status: 20}, t);
await self.saasorderdeliverinfoDao.update({
id: params.id,
sve_deliver_express_no: params.sve_deliver_express_no,
sve_deliver_express_img: params.sve_deliver_express_img
}, t);
return 1;
});
return system.getResultSuccess();
}
async pageByCondition(params) { async pageByCondition(params) {
let page = { let page = {
count: 0, count: 0,
......
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