Commit 06b242c3 by 兰国旗

laolan

parent 5a7346ba
...@@ -672,7 +672,7 @@ class RegCenterOrderService{ ...@@ -672,7 +672,7 @@ class RegCenterOrderService{
ab.solutionList[j].solutionContent = JSON.stringify(ab.solutionList[j].solutionContent); ab.solutionList[j].solutionContent = JSON.stringify(ab.solutionList[j].solutionContent);
console.log('abababab---+++---++', ab) console.log('abababab---+++---++', ab)
var self = this; var self = this;
var res = await this.needsolutionDao.db.transaction(async function (t) { await this.needsolutionDao.db.transaction(async function (t) {
ab.solutionList[j]["needNo"] = needinfo.needNo; ab.solutionList[j]["needNo"] = needinfo.needNo;
var od = await self.needsolutionDao.create(ab.solutionList[j], t); var od = await self.needsolutionDao.create(ab.solutionList[j], t);
if (od && od.id) { if (od && od.id) {
...@@ -900,10 +900,17 @@ class RegCenterOrderService{ ...@@ -900,10 +900,17 @@ class RegCenterOrderService{
var ns = await this.needsolutionDao.model.findOne({ var ns = await this.needsolutionDao.model.findOne({
where: { orderNo: ab.orderNo }, raw: true where: { orderNo: ab.orderNo }, raw: true
}); });
var od = await this.orderinfoDao.model.findOne({
where: { orderNo: ab.orderNo }, raw: true
});
if (!ns || !ns.id) { if (!ns || !ns.id) {
return system.getResultFail(-301, "未知方案"); return system.getResultFail(-301, "未知方案");
} }
ab["bizId"] = ns.channelSolutionNo; if(ab.status == 703){
ab["bizId"] = od.channelOrderNo;
}else{
ab["bizId"] = ns.channelSolutionNo;
}
ab["solutionNo"] = ns.solutionNo; ab["solutionNo"] = ns.solutionNo;
pobj.actionBody = ab; pobj.actionBody = ab;
return this.regAcceptPartnerNotification(pobj); return this.regAcceptPartnerNotification(pobj);
...@@ -913,7 +920,6 @@ class RegCenterOrderService{ ...@@ -913,7 +920,6 @@ class RegCenterOrderService{
console.log('服务商通知状态变更pobj++++',pobj) console.log('服务商通知状态变更pobj++++',pobj)
var ab = pobj.actionBody; var ab = pobj.actionBody;
var user = pobj.userInfo; var user = pobj.userInfo;
if (!user || !user.id) { if (!user || !user.id) {
return system.getResultFail(-100, "未知用户"); return system.getResultFail(-100, "未知用户");
} }
......
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