Skip to content

Z
zhichan
Commit 62106e7b by 宋毅
Options

Merge branch 'center-channel' of gitlab.gongsibao.com:jiangyong/zhichan into center-channel

parents aa0d19e7 635b9d6e
Showing with 40 additions and 33 deletions
center-channel/app/base/api/impl/ic/order.js
...@@ -18,33 +18,47 @@ class Order extends APIBase { ...@@ -18,33 +18,47 @@ class Order extends APIBase {
if (!pobj.isDirectBuy || pobj.isDirectBuy == 0) { if (!pobj.isDirectBuy || pobj.isDirectBuy == 0) {
pobj.isDirectBuy = 0; pobj.isDirectBuy = 0;
} }
if (!pobj.mainOrderNo) { if (!pobj.orderNo) {
return regCfg.getResultFail("mainOrderNo不能为空"); return regCfg.getResultFail("orderNo不能为空");
} }
var i = 0; // var i = 0;
var orderLength = pobj.subOrderList.lenght; // var orderLength = pobj.subOrderList.lenght;
for (i = 0; i <= orderLength; i++) { // for (i = 0; i <= orderLength; i++) {
if (!pobj.subOrderList[i].orderNo) { // if (!pobj.subOrderList[i].orderNo) {
// return regCfg.getResultFail("orderNo不能为空");
// }
// if (pobj.isDirectBuy == 0 && !pobj.subOrderList[i].bizId) {
// return regCfg.getResultFail("非直接下单bizId不能为空");
// }
// if (pobj.isDirectBuy == 1 && !pobj.subOrderList[i].phone) {
// return regCfg.getResultFail("直接下单phone不能为空");
// }
// if (pobj.isDirectBuy == 1 && !pobj.subOrderList[i].consultType) {
// return regCfg.getResultFail("直接下单consultType不能为空");
// }
// // if (pobj.subOrderList[i].area) {
// // pobj.subOrderList[i].area = regCfg.baiduArea[pobj.subOrderList[i].area]
// // }
// if (!pobj.subOrderList[i].area) {
// return regCfg.getResultFail("area参数错误");
// }
// }
if (!pobj.orderNo) {
return regCfg.getResultFail("orderNo不能为空"); return regCfg.getResultFail("orderNo不能为空");
} }
if (pobj.isDirectBuy == 0 && !pobj.subOrderList[i].bizId) { if (pobj.isDirectBuy==0 && !pobj.bizId) {
return regCfg.getResultFail("非直接下单bizId不能为空"); return self.getResultFail("非直接下单bizId不能为空");
} }
if (pobj.isDirectBuy == 1 && !pobj.subOrderList[i].phone) { if (pobj.isDirectBuy==1 && !pobj.phone) {
return regCfg.getResultFail("直接下单phone不能为空"); return self.getResultFail("直接下单phone不能为空");
} }
if (pobj.isDirectBuy == 1 && !pobj.subOrderList[i].consultType) { if (pobj.isDirectBuy==1 && !pobj.consultType) {
return regCfg.getResultFail("直接下单consultType不能为空"); return self.getResultFail("直接下单consultType不能为空");
}
// if (pobj.subOrderList[i].area) {
// pobj.subOrderList[i].area = regCfg.baiduArea[pobj.subOrderList[i].area]
// }
if (!pobj.subOrderList[i].area) {
return regCfg.getResultFail("area参数错误");
} }
if (pobj.area) {
pobj.area = regCfg.baiduArea[pobj.area]
} }
pobj.status = 1; pobj.status = 1;
pobj.action_type = "regOrderStatus"; pobj.action_type = "regOrderStatus";
......
center-channel/app/base/service/impl/common/ncSve.js
...@@ -247,10 +247,8 @@ class NcService extends AppServiceBase { ...@@ -247,10 +247,8 @@ class NcService extends AppServiceBase {
console.log('nc closeNeed+++',a) console.log('nc closeNeed+++',a)
} }
this.utilsPushSve.aliBusiness2Fq(pobj, "pushCloseICPNeed"); this.utilsPushSve.aliBusiness2Fq(pobj, "pushCloseICPNeed");
return system.getResultSuccess();
} else {
return system.getResult(null, "close fail　100389 ");
} }
return result;
} }
} }
......
center-channel/app/base/service/impl/common/qcCenterOrderSve.js
...@@ -402,11 +402,9 @@ class QcCenterOrderService extends AppServiceBase { ...@@ -402,11 +402,9 @@ class QcCenterOrderService extends AppServiceBase {
resultInfo: "", resultInfo: "",
optitle: "推送ali关闭需求->closeNeed", optitle: "推送ali关闭需求->closeNeed",
}); });
self.utilsPushSve.aliBusiness2Fq(pobj, "pushCloseWangWenNeed"); self.utilsPushSve.aliBusiness2Fq(pobj, "pushCloseICPNeed");
return system.getResultSuccess();
} else {
return system.getResult(null, "close fail　100389 ");
} }
return result;
} }
//提交沟通记录 //提交沟通记录
......
center-channel/app/base/service/impl/common/rtSve.js
...@@ -250,10 +250,8 @@ class RtService extends AppServiceBase { ...@@ -250,10 +250,8 @@ class RtService extends AppServiceBase {
console.log('rt closeNeed+++',a) console.log('rt closeNeed+++',a)
} }
this.utilsPushSve.aliBusiness2Fq(pobj, "pushCloseICPNeed"); this.utilsPushSve.aliBusiness2Fq(pobj, "pushCloseICPNeed");
return system.getResultSuccess();
} else {
return system.getResult(null, "close fail　100389 ");
} }
return result;
} }
} }
......
center-channel/app/base/service/impl/utilsSve/utilsNeedSve2.js
...@@ -323,11 +323,8 @@ class UtilsNeedService2 extends AppServiceBase { ...@@ -323,11 +323,8 @@ class UtilsNeedService2 extends AppServiceBase {
} }
console.log("closed need a+++", a); console.log("closed need a+++", a);
self.utilsPushSve.aliBusiness2Fq(pobj, "pushCloseICPNeed"); self.utilsPushSve.aliBusiness2Fq(pobj, "pushCloseICPNeed");
return system.getResultSuccess();
} else {
return system.getResult(null, "close fail　100389 ");
} }
return result;
} }
//查询需求详情 //查询需求详情
......
center-channel/app/base/service/impl/utilsSve/utilsPushSve.js
...@@ -180,6 +180,7 @@ class UtilsPushService extends AppServiceBase { ...@@ -180,6 +180,7 @@ class UtilsPushService extends AppServiceBase {
content: JSON.stringify(pobj), content: JSON.stringify(pobj),
resultInfo: productItemInterfaceResult.data ? JSON.stringify(productItemInterfaceResult.data) : "接口数据为空", resultInfo: productItemInterfaceResult.data ? JSON.stringify(productItemInterfaceResult.data) : "接口数据为空",
optitle: pobj.opType + "推送蜂擎获取的接口信息->baiduBusiness2Fq", optitle: pobj.opType + "推送蜂擎获取的接口信息->baiduBusiness2Fq",
pobj:pobj
}); });
if (pobj.interface_info) { if (pobj.interface_info) {
var pushBusInfo = await this.pushBusInfo(pobj, opType, 1); var pushBusInfo = await this.pushBusInfo(pobj, opType, 1);
...@@ -203,6 +204,7 @@ class UtilsPushService extends AppServiceBase { ...@@ -203,6 +204,7 @@ class UtilsPushService extends AppServiceBase {
content: JSON.stringify(pobj), content: JSON.stringify(pobj),
resultInfo: productItemInterfaceResult.data ? JSON.stringify(productItemInterfaceResult.data) : "接口数据为空", resultInfo: productItemInterfaceResult.data ? JSON.stringify(productItemInterfaceResult.data) : "接口数据为空",
optitle: opType + "推送蜂擎获取的接口信息->baiduBusiness2Delivery", optitle: opType + "推送蜂擎获取的接口信息->baiduBusiness2Delivery",
pobj:pobj
}); });
if (pobj.interface_info) { if (pobj.interface_info) {
await this.pushBusInfo(pobj, opType, 1); await this.pushBusInfo(pobj, opType, 1);
......
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