Skip to content

Z
zhichan
Commit 9624d732 by 王昆
Options

gsbn

parent 60616107
Showing with 53 additions and 59 deletions
xggsve-order/app/base/service/impl/order/iborderSve.js
...@@ -201,51 +201,66 @@ class IborderService extends ServiceBase { ...@@ -201,51 +201,66 @@ class IborderService extends ServiceBase {
} }
async completedOrder(params, t) { async completedOrder(params, t) {
let order = this.findById(params.id); let order = await this.findById(params.id);
if (!order.legalName) { if (!params.legalName) {
return system.getResult(null, '法人姓名'); return system.getResult(null, '法人姓名');
} }
if (!order.legalMobile) { if (!params.legalMobile) {
return system.getResult(null, '法人电话'); return system.getResult(null, '法人电话');
} }
if (!order.idcard) { if (!params.idcard) {
return system.getResult(null, '法人身份证'); return system.getResult(null, '法人身份证');
} }
if (!order.idcardFront) { if (!params.idcardFront) {
return system.getResult(null, '身份证正面照片'); return system.getResult(null, '身份证正面照片');
} }
if (!order.idcardBack) { if (!params.idcardBack) {
return system.getResult(null, '身份证反面照片'); return system.getResult(null, '身份证反面照片');
} }
if (!order.names) { if (!params.names) {
return system.getResult(null, '个体户名称'); return system.getResult(null, '个体户名称');
} }
if (!order.capital) { if (!params.capital) {
return system.getResult(null, '注册资本'); return system.getResult(null, '注册资本');
} }
if (!order.domicile_id) { if (!params.domicile_id) {
return system.getResult(null, '注册地id'); return system.getResult(null, '注册地id');
} }
if (!order.domicileName) { if (!params.domicileName) {
return system.getResult(null, '注册地名称'); return system.getResult(null, '注册地名称');
} }
if (!order.businessType) { if (!params.businessType) {
return system.getResult(null, '经营范围'); return system.getResult(null, '经营范围');
} }
if (!order.businessScope) { if (!params.businessScope) {
return system.getResult(null, '经营范围详情'); return system.getResult(null, '经营范围详情');
} }
if (!order.mailAddr) { if (!params.mailAddr) {
return system.getResult(null, '邮寄地址'); return system.getResult(null, '邮寄地址');
} }
if (!order.mailTo) { if (!params.mailTo) {
return system.getResult(null, '收件人'); return system.getResult(null, '收件人');
} }
if (!order.mailMobile) { if (!params.mailMobile) {
return system.getResult(null, '收件人电话'); return system.getResult(null, '收件人电话');
} }
order.legalName = params.legalName;
order.legalMobile = params.legalMobile;
order.idcard = params.idcard;
order.idcardFront = params.idcardFront;
order.idcardBack = params.idcardBack;
order.names = params.names;
order.capital = params.capital;
order.domicile_id = params.domicile_id;
order.domicileName = params.domicileName;
order.businessType = params.businessType;
order.businessScope = params.businessScope;
order.mailAddr = params.mailAddr;
order.mailTo = params.mailTo;
order.mailMobile = params.mailMobile;
order.isInfoComplete = true; order.isInfoComplete = true;
let orderBase = await this.iborderbaseDao.findById(params.id); let orderBase = await this.iborderbaseDao.findById(params.id);
......
xggsve-order/app/base/service/impl/order/iborderbaseSve.js
...@@ -41,7 +41,7 @@ class IborderbaseService extends ServiceBase { ...@@ -41,7 +41,7 @@ class IborderbaseService extends ServiceBase {
} }
try { try {
let exists = await this.service.findOne({thirdNo: params.thirdNo}); let exists = await this.dao.findOne({thirdNo: params.thirdNo});
if(exists) { if(exists) {
return system.getResult(null, `订单号【${params.thirdNo}】已存在`); return system.getResult(null, `订单号【${params.thirdNo}】已存在`);
} }
...@@ -69,21 +69,16 @@ class IborderbaseService extends ServiceBase { ...@@ -69,21 +69,16 @@ class IborderbaseService extends ServiceBase {
await this.db.transaction(async t => { await this.db.transaction(async t => {
//创建基类表 //创建基类表
let _baseOrder = await self.create(params, t); let _baseOrder = await self.create(params, t);
var payment = {
if (productType == 1010 && params.payType == 1) { order_id: _baseOrder.id,
// 代开订单按次支付的单子, 走异步支付流程 price: params.price,
} else { channelName: channel.channelName,
var payment = { companyName: "",
order_id: _baseOrder.id, payType: params.payType,
price: params.price, payStatus: "10",
channelName: channel.channelName, };
companyName: "", payment = await this.paymentSve.create(payment, t);
payType: params.payType, params.orderpay_id = payment.id;
payStatus: "10",
};
payment = await this.paymentSve.create(payment, t);
params.orderpay_id = payment.id;
}
// 将id赋值 // 将id赋值
params.id = _baseOrder.id; params.id = _baseOrder.id;
...@@ -102,7 +97,7 @@ class IborderbaseService extends ServiceBase { ...@@ -102,7 +97,7 @@ class IborderbaseService extends ServiceBase {
*/ */
async apiCompletedOrder(params) { async apiCompletedOrder(params) {
try { try {
let childSve = this.getService(); let childSve = this.getService(params.productType);
return await childSve.completedOrder(params); return await childSve.completedOrder(params);
} catch (error) { } catch (error) {
return system.getResult(null, `系统错误 错误信息 ${error}`); return system.getResult(null, `系统错误 错误信息 ${error}`);
......
xggsve-order/app/base/service/impl/order/iborderdzSve.js
...@@ -67,24 +67,12 @@ class IborderdzService extends ServiceBase { ...@@ -67,24 +67,12 @@ class IborderdzService extends ServiceBase {
try { try {
//1 检查个体户是否存在 （根据统一社会信用代码查个体工商户是否存在） //1 检查个体户是否存在 （根据统一社会信用代码查个体工商户是否存在）
this.trimObject(params); this.trimObject(params);
if (!params.id) { if (!params.id) { return system.getResult(null, `参数错误 ID 不能为空`); }
return system.getResult(null, `参数错误 ID 不能为空`); if (!params.legalName) { return system.getResult(null, `参数错误 法人姓名不能为空`); }
} if (!params.legalMobile) { return system.getResult(null, `参数错误 法人电话不能为空`); }
if (!params.legalName) { if (!params.creditCode) { return system.getResult(null, `参数错误 法人统一社会信用代码不能为空`); }
return system.getResult(null, `参数错误 法人姓名不能为空`); if (!params.names) { 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.businessmenDao.findBusinessmenByCreditCode(this.trim(params.creditCode)); let _businessmenRes = await this.businessmenDao.findBusinessmenByCreditCode(this.trim(params.creditCode));
...@@ -99,13 +87,11 @@ class IborderdzService extends ServiceBase { ...@@ -99,13 +87,11 @@ class IborderdzService extends ServiceBase {
} }
let self = this; let self = this;
//向参数中添加 是否完善信息标识 //向参数中添加 是否完善信息标识
params.isInfoComplete = 1; params.isInfoComplete=1;
await this.db.transaction(async t => { await this.db.transaction(async t => {
//更新主表 //更新主表
await self.iborderbaseDao.update({ await self.iborderbaseDao.update({ businessmen_id: self.trim(_businessmenRes.id),
businessmen_id: self.trim(_businessmenRes.id), id: self.trim(params.id),isInfoComplete:1 }, t);
id: self.trim(params.id), isInfoComplete: 1
}, t);
//更新子表 //更新子表
await this.dao.update(params, t); await this.dao.update(params, t);
}); });
...@@ -115,10 +101,8 @@ class IborderdzService extends ServiceBase { ...@@ -115,10 +101,8 @@ class IborderdzService extends ServiceBase {
//如果不存在id 创建后更新 //如果不存在id 创建后更新
let _businessment = await this.businessmenDao.create(params, t); let _businessment = await this.businessmenDao.create(params, t);
//更新主表 //更新主表
await self.iborderbaseDao.update({ await self.iborderbaseDao.update({ businessmen_id: self.trim(_businessment.id), id: self.trim(params.id),
businessmen_id: self.trim(_businessment.id), id: self.trim(params.id), isInfoComplete:1 }, t);
isInfoComplete: 1
}, t);
//更新子表 //更新子表
await this.dao.update(params, t); await this.dao.update(params, t);
}); });
......
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