Skip to content

Z
zhichan
Commit 0d65d899 by 孙亚楠
Options

d

parent 87fcd575
Showing with 29 additions and 20 deletions
bash.exe.stackdump 0 → 100644
Stack trace:
Frame Function Args
000FFFFA1F8 001800617BE (0018025C578, 0018023DFBE, 000FFFFA1F8, 000FFFF9100)
000FFFFA1F8 001800490FA (00000000000, 00000000000, 00000000000, 00000000000)
000FFFFA1F8 00180049132 (0018025C629, 000FFFFA0B8, 000FFFFA1F8, 00000000000)
000FFFFA1F8 001800B4BA5 (00000000000, 00000000000, 00000000000, 00000000000)
000FFFFA1F8 001800B4CDD (000FFFFA210, 00000000000, 00000000000, 00000000000)
000FFFFA4C0 001800B6351 (000FFFFA210, 00000000000, 00000000000, 00000000000)
End of stack trace
xggsve-order/app/base/service/impl/order/obusinessmenSve.js
...@@ -114,9 +114,9 @@ class ObusinessmenService extends ServiceBase { ...@@ -114,9 +114,9 @@ class ObusinessmenService extends ServiceBase {
} }
let _obusinessmen = await this.dao.findById(this.trim(params.id)); let _obusinessmen = await this.dao.findById(this.trim(params.id));
if(_obusinessmen.saas_id != this.trim(params.saas_id)){ // if(_obusinessmen.saas_id != this.trim(params.saas_id)){
return system.getResult(null, `【${saas_id}】错误`); // return system.getResult(null, `【${saas_id}】错误`);
} // }
let _order = await this.oorderDao.model.findOne({ let _order = await this.oorderDao.model.findOne({
where:{ where:{
id:_obusinessmen.order_id id:_obusinessmen.order_id
...@@ -313,9 +313,9 @@ class ObusinessmenService extends ServiceBase { ...@@ -313,9 +313,9 @@ class ObusinessmenService extends ServiceBase {
}else{ }else{
where.id = this.trim(params.id); where.id = this.trim(params.id);
} }
if(params.saas_id){ // if(params.saas_id){
where.saas_id = this.trim(params.saas_id); // where.saas_id = this.trim(params.saas_id);
} // }
let bean = await this.dao.model.findOne({ let bean = await this.dao.model.findOne({
where:where where:where
}); });
......
xggsve-order/app/base/service/impl/order/oorderSve.js
...@@ -68,7 +68,7 @@ class OorderService extends ServiceBase { ...@@ -68,7 +68,7 @@ class OorderService extends ServiceBase {
order.saas_deliver_api = this.trim(params.saas_deliver_api); order.saas_deliver_api = this.trim(params.saas_deliver_api);
order.service_items = this.trim(params.service_items); order.service_items = this.trim(params.service_items);
order.ali_deliver_api = this.trim(params.ali_deliver_api) || ""; order.ali_deliver_api = this.trim(params.ali_deliver_api) || "";
order.saas_id = this.trim(params.saas_id) || ""; // order.saas_id = this.trim(params.saas_id) || "";
order.price = params.price || 0 order.price = params.price || 0
try { try {
// 验证订单是否存在 // 验证订单是否存在
...@@ -116,7 +116,7 @@ class OorderService extends ServiceBase { ...@@ -116,7 +116,7 @@ class OorderService extends ServiceBase {
await self.oorderprocessDao.bulkCreate(orderProcessList, t); await self.oorderprocessDao.bulkCreate(orderProcessList, t);
orderReg.id = order.id; orderReg.id = order.id;
orderReg.saas_id = order.saas_id // orderReg.saas_id = order.saas_id
await self.oorderinforegDao.create(orderReg, t); await self.oorderinforegDao.create(orderReg, t);
//如果存在交付商ID 则需要创建交付商记录 并更新订单表的交付商信息 //如果存在交付商ID 则需要创建交付商记录 并更新订单表的交付商信息
...@@ -128,7 +128,7 @@ class OorderService extends ServiceBase { ...@@ -128,7 +128,7 @@ class OorderService extends ServiceBase {
deliver_divide:self.trim(params.deliver_divide) || 0, deliver_divide:self.trim(params.deliver_divide) || 0,
delier_user_id : self.trim(params.delier_user_id), delier_user_id : self.trim(params.delier_user_id),
deliver_user_path: self.trim(params.deliver_user_path), deliver_user_path: self.trim(params.deliver_user_path),
saas_id: self.trim(params.saas_id) // saas_id: self.trim(params.saas_id)
}, t); }, t);
await self.dao.update({id:order.id,deliver_id:_oorderdeliver.id},t); await self.dao.update({id:order.id,deliver_id:_oorderdeliver.id},t);
} }
...@@ -413,9 +413,9 @@ class OorderService extends ServiceBase { ...@@ -413,9 +413,9 @@ class OorderService extends ServiceBase {
[this.db.Op.like]: this.trim(params.bd_path) + "%" [this.db.Op.like]: this.trim(params.bd_path) + "%"
} }
} }
if (params.saas_id) { // if (params.saas_id) {
where.saas_id = this.trim(params.saas_id); // where.saas_id = this.trim(params.saas_id);
} // }
var currentPage = Number(params.currentPage || 1); var currentPage = Number(params.currentPage || 1);
var pageSize = Number(params.pageSize || 10); var pageSize = Number(params.pageSize || 10);
...@@ -913,7 +913,7 @@ class OorderService extends ServiceBase { ...@@ -913,7 +913,7 @@ class OorderService extends ServiceBase {
id:this.trim(params.id), id:this.trim(params.id),
createdBegin:params.createdBegin, createdBegin:params.createdBegin,
createdEnd:params.createdEnd, createdEnd:params.createdEnd,
saas_id:params.saas_id // saas_id:params.saas_id
}; };
if(!params.isManager){//如果是管理员 则可能看到所有的数据 if(!params.isManager){//如果是管理员 则可能看到所有的数据
......
xggsve-order/app/base/service/impl/order/oorderdeliverSve.js
...@@ -33,9 +33,9 @@ class OorderdeliverService extends ServiceBase { ...@@ -33,9 +33,9 @@ class OorderdeliverService extends ServiceBase {
} else { } else {
return system.getResult(null, `参数错误 交付商ID不能为空`); return system.getResult(null, `参数错误 交付商ID不能为空`);
} }
if(params.saas_id){ // if(params.saas_id){
where.saas_id = this.trim(params.saas_id); // where.saas_id = this.trim(params.saas_id);
} // }
//交付商订单表条件 //交付商订单表条件
if (params.createdBegin && params.createdEnd) { if (params.createdBegin && params.createdEnd) {
where.createdBegin = this.trim(params.createdBegin); where.createdBegin = this.trim(params.createdBegin);
......
xggsve-order/app/base/service/impl/order/oorderstatusSve.js
...@@ -619,9 +619,9 @@ class OorderstatusService extends ServiceBase { ...@@ -619,9 +619,9 @@ class OorderstatusService extends ServiceBase {
let _order = params._order; let _order = params._order;
let _orderInfo = await this.oorderinforegDao.findById(_order.id); let _orderInfo = await this.oorderinforegDao.findById(_order.id);
if(!_orderInfo.saas_id || !_order.saas_id){ // if(!_orderInfo.saas_id || !_order.saas_id){
return system.getResult(null,`系统错误，请联系系统管理员`); // return system.getResult(null,`系统错误，请联系系统管理员`);
} // }
let _obusinessmenProperty = {}; let _obusinessmenProperty = {};
_obusinessmenProperty.name = this.trim(params.name); _obusinessmenProperty.name = this.trim(params.name);
_obusinessmenProperty.credit_code = this.trim(params.credit_code); _obusinessmenProperty.credit_code = this.trim(params.credit_code);
...@@ -640,7 +640,7 @@ class OorderstatusService extends ServiceBase { ...@@ -640,7 +640,7 @@ class OorderstatusService extends ServiceBase {
_obusinessmenProperty.delier_user_id = this.trim(params.delier_user_id); _obusinessmenProperty.delier_user_id = this.trim(params.delier_user_id);
_obusinessmenProperty.deliver_user_path= this.trim(params.deliver_user_path); _obusinessmenProperty.deliver_user_path= this.trim(params.deliver_user_path);
_obusinessmenProperty.company_id = this.trim(params.company_id); _obusinessmenProperty.company_id = this.trim(params.company_id);
_obusinessmenProperty.saas_id = _orderInfo.saas_id || ""; // _obusinessmenProperty.saas_id = _orderInfo.saas_id || "";
let orderProperty = {}; let orderProperty = {};
orderProperty.id = _order.id; orderProperty.id = _order.id;
orderProperty.status = this.trim(params.status); orderProperty.status = this.trim(params.status);
......
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