Skip to content

Z
zhichan
Commit f5666332 by 王昆
Options

gsb

parent b9a0ea46
Showing with 34 additions and 20 deletions
xggsve-order/app/base/service/impl/order/iborderbaseSve.js
...@@ -40,7 +40,7 @@ class IborderbaseService extends ServiceBase { ...@@ -40,7 +40,7 @@ class IborderbaseService extends ServiceBase {
// if(!params.channelNo){ // if(!params.channelNo){
// return system.getResult(null, `参数错误 渠道名称错误`); // return system.getResult(null, `参数错误 渠道名称错误`);
// } // }
if(!params.thirdNo){ if (!params.thirdNo) {
return system.getResult(null, `请传入订单id`); return system.getResult(null, `请传入订单id`);
} }
// if(!Number(params.price)<0){ // if(!Number(params.price)<0){
...@@ -81,6 +81,7 @@ class IborderbaseService extends ServiceBase { ...@@ -81,6 +81,7 @@ class IborderbaseService extends ServiceBase {
params.productType = productType; params.productType = productType;
params.price = Number(params.price || 0); params.price = Number(params.price || 0);
params.status = "1000"; // 待处理 params.status = "1000"; // 待处理
params.payStatus = "10"; // 支付状态
params.channelOrderNo = params.channelNo; params.channelOrderNo = params.channelNo;
let self = this; let self = this;
...@@ -89,14 +90,15 @@ class IborderbaseService extends ServiceBase { ...@@ -89,14 +90,15 @@ class IborderbaseService extends ServiceBase {
//创建基类表 //创建基类表
let _baseOrder = await self.create(params, t); let _baseOrder = await self.create(params, t);
// 处理payment if (productType == 1010 && params.payType == 1) {
if (payType != 2) { // 代开订单按次支付的单子, 走异步支付流程
} else {
var payment = { var payment = {
order_id: _baseOrder.id, order_id: _baseOrder.id,
price: params.price, price: params.price,
channelName: channel.channelName, channelName: channel.channelName,
companyName: "", companyName: "",
payType: payType, payType: params.payType,
payStatus: "10", payStatus: "10",
}; };
payment = await this.paymentSve.create(payment); payment = await this.paymentSve.create(payment);
...@@ -128,12 +130,24 @@ class IborderbaseService extends ServiceBase { ...@@ -128,12 +130,24 @@ class IborderbaseService extends ServiceBase {
try { try {
//1 检查个体户是否存在 （根据统一社会信用代码查个体工商户是否存在） //1 检查个体户是否存在 （根据统一社会信用代码查个体工商户是否存在）
this.trimObject(params); this.trimObject(params);
if (!params.id) { return system.getResult(null, `参数错误 ID 不能为空`); } if (!params.id) {
if (!params.legalName) { return system.getResult(null, `参数错误 法人姓名不能为空`); } return system.getResult(null, `参数错误 ID 不能为空`);
if (!params.legalMobile) { return system.getResult(null, `参数错误 法人电话不能为空`); } }
if (!params.creditCode) { return system.getResult(null, `参数错误 法人统一社会信用代码不能为空`); } if (!params.legalName) {
if (!params.names) { return system.getResult(null, `参数错误 个体户名称不能为空`); } return system.getResult(null, `参数错误 法人姓名不能为空`);
if (!params.businessScope) { return system.getResult(null, `参数错误 经营范围不能为空`); } }
if (!params.legalMobile) {
return system.getResult(null, `参数错误 法人电话不能为空`);
}
if (!params.creditCode) {
return system.getResult(null, `参数错误 法人统一社会信用代码不能为空`);
}
if (!params.names) {
return system.getResult(null, `参数错误 个体户名称不能为空`);
}
if (!params.businessScope) {
return system.getResult(null, `参数错误 经营范围不能为空`);
}
//2 如果不存在添加保存个体户 完善信息 //2 如果不存在添加保存个体户 完善信息
let _businessmenRes = await this.businessmenSve.findBusinessmenByCreditCode(this.trim(params.creditCode)); let _businessmenRes = await this.businessmenSve.findBusinessmenByCreditCode(this.trim(params.creditCode));
...@@ -148,19 +162,19 @@ class IborderbaseService extends ServiceBase { ...@@ -148,19 +162,19 @@ class IborderbaseService extends ServiceBase {
return system.getResult(null, `参数错误 订单不存在`); return system.getResult(null, `参数错误 订单不存在`);
} }
let self = this; let self = this;
await this.db.transaction(async t =>{ await this.db.transaction(async t => {
//更新主表 //更新主表
await self.dao.update({businessmen_id:self.trim(_businessmenRes.id),id:self.trim(params.id)},t); await self.dao.update({businessmen_id: self.trim(_businessmenRes.id), id: self.trim(params.id)}, t);
//更新子表 //更新子表
await childSve.dao.update(params, null); await childSve.dao.update(params, null);
}); });
} else { } else {
let self = this; let self = this;
await this.db.transaction(async t =>{ await this.db.transaction(async t => {
//如果不存在id 创建后更新 //如果不存在id 创建后更新
let _businessment = await this.businessmenSve.dao.create(params,t); let _businessment = await this.businessmenSve.dao.create(params, t);
//更新主表 //更新主表
await self.dao.update({businessmen_id:self.trim(_businessment.id),id:self.trim(params.id)},t); await self.dao.update({businessmen_id: self.trim(_businessment.id), id: self.trim(params.id)}, t);
//更新子表 //更新子表
await childSve.dao.update(params, null); await childSve.dao.update(params, null);
}); });
...@@ -173,25 +187,25 @@ class IborderbaseService extends ServiceBase { ...@@ -173,25 +187,25 @@ class IborderbaseService extends ServiceBase {
/** /**
* 订单办理 * 订单办理
* @param {} params * @param {} params
*/ */
async apiHandling (params){ async apiHandling(params) {
//1 检查个体户参数 //1 检查个体户参数
//2 检查是否支付 //2 检查是否支付
} }
/** /**
* 计算 增值税 和 附加税 * 计算 增值税 和 附加税
* @param {*} params * @param {*} params
*/ */
async calInvoiceAmount (params){ async calInvoiceAmount(params) {
let res = await this.cal let res = await this.cal
} }
/** /**
* 更新base表 * 更新base表
* @param {*} params * @param {*} params
*/ */
async completedOrderInfo(params, t) { async completedOrderInfo(params, t) {
try { try {
......
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