Skip to content

Z
zhichan
Commit c79fc3a3 by 宋毅
Options

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

parents 6fd0109a cdd4fabc
Showing with 74 additions and 32 deletions
center-channel/app/base/service/impl/common/centerorderSve.js
...@@ -22,23 +22,34 @@ class CenterorderService{ ...@@ -22,23 +22,34 @@ class CenterorderService{
async submitProgramme(pobj){ async submitProgramme(pobj){
var res = await this.reqCenterOrderApi(pobj); var res = await this.reqCenterOrderApi(pobj);
if(res && res.status==0 && res.data && res.data.needinfo && res.data.needsolution){ if(res && res.status==0 && res.data && res.data.needinfo && res.data.needsolution){
var needinfo = res.data.needinfo;//需求信息 // var needinfo = res.data.needinfo;//需求信息
var needsolution = res.data.needsolution;//方案信息 // var needsolution = res.data.needsolution;//方案信息
//推送数据至阿 // var ab = pobj.actionBody;
var bizType = pobj.actionBody.solutionContent.bizType || "";//业务类型里 // //推送数据至阿里
var pushObj = { // var bizType = ab.solutionContent.bizType || "";//业务类型里
intentionBizId:needinfo.channelNeedNo,bizType:bizType,solution:ab.solutionContent.solution // var pushObj = {
}; // intentionBizId:needinfo.channelNeedNo,bizType:bizType,solution:ab.solutionContent.solution
// var pushRes = await this.aliclient.reqbyget({action:"",reqbody:pushObj}); // };
// if(pushRes && pushRes.SolutionBizId){ // //推送方案
// var reqObj2 = { // this.aliclient.reqbyget({action:"SubmitSolution",reqbody:pushObj}).then(pushRes=>{
// actionType:"receiveProgrammeNo", // if(pushRes && pushRes.status==0 && pushRes.data){
// actionBody:{ // var resData = pushRes.data;
// solutionNo:needsolution.needsolution, // var reqObj2 = {
// solutionBizId:pushRes.SolutionBizId // actionType:"receiveProgrammeNo",
// } // actionBody:{
// solutionNo:needsolution.solutionNo,
// solutionBizId:resData.SolutionBizId
// }
// };
// await this.reqCenterOrderApi(reqObj2);//保存渠道方案id
// }
// });
// //推送需求小记
// if(needinfo.pushflag && needinfo.pushflag==1){//推送标志 值为1推送需求小记
// var pushObj2={
// intentionBizId:needinfo.channelNeedNo,note:"创建方案"
// }; // };
// await this.reqCenterOrderApi(reqObj2);//保存渠道方案id // this.aliclient.reqbyget({action:"SubmitIntentionNote",reqbody:pushObj2});
// } // }
} }
return system.getResultSuccess(); return system.getResultSuccess();
...@@ -46,16 +57,22 @@ class CenterorderService{ ...@@ -46,16 +57,22 @@ class CenterorderService{
//服务商方案作废 //服务商方案作废
async abolishProgramme(pobj){ async abolishProgramme(pobj){
var res = await this.reqCenterOrderApi(pobj); var res = await this.reqCenterOrderApi(pobj);
if(res && res.status==0 && res.data && res.data.channelNeedNo){ if(res && res.status==0 && res.data && res.data.channelSolutionNo){
//推送数据至阿 //推送数据至阿里
var pushObj = { // var pushObj = {
solutionBizId:res.data.channelNeedNo,note:pobj.actionBody.note || "" // solutionBizId:res.data.channelSolutionNo,note:pobj.actionBody.note || ""
}; // };
// var pushRes = await this.aliclient.reqbyget({action:"",reqbody:pushObj}); // this.aliclient.reqbyget({action:"RejectSolution",reqbody:pushObj})
} }
return res; return res;
} }
} }
module.exports = CenterorderService; module.exports = CenterorderService;
// var task = new CenterorderService();
// task.aliclient.reqbyget({action:"SubmitSolution",reqbody:{}}).then(d=>{
// console.log(d,"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
// })
// 提方案-SubmitSolution
// 作废方案-RejectSolution
// 提需求小记-SubmitIntentionNote
// 查需求小记-ListIntentionNote
\ No newline at end of file
center-channel/app/base/utils/aliyunClient.js
const Client = require('aliyun-api-gateway').Client; const Client = require('aliyun-api-gateway').Client;
var RPCClient = require('@alicloud/pop-core').RPCClient; var RPCClient = require('@alicloud/pop-core').RPCClient;
const system = require("../system");
class aliyunClient { class aliyunClient {
constructor() { constructor() {
this.aliclient = new RPCClient({ this.aliclient = new RPCClient({
...@@ -9,6 +9,7 @@ class aliyunClient { ...@@ -9,6 +9,7 @@ class aliyunClient {
endpoint: "https://companyreg.aliyuncs.com", endpoint: "https://companyreg.aliyuncs.com",
apiVersion: "2020-03-06" apiVersion: "2020-03-06"
}); });
this.pushlogSve = system.getObject("service.common.pushlogSve");
} }
async post(aliReqUrl, key, secret, actionBody) { async post(aliReqUrl, key, secret, actionBody) {
const client = new Client(key, secret); const client = new Client(key, secret);
...@@ -28,13 +29,35 @@ class aliyunClient { ...@@ -28,13 +29,35 @@ class aliyunClient {
async reqbyget(obj, cbk) { async reqbyget(obj, cbk) {
var action = obj.action; var action = obj.action;
var reqbody = obj.reqbody; var reqbody = obj.reqbody;
return this.aliclient.request(action, reqbody, { try {
timeout: 3000, // default 3000 ms var res = await this.aliclient.request(action, reqbody, {
formatAction: true, // default true, format the action to Action timeout: 3000, // default 3000 ms
formatParams: true, // default true, format the parameter name to first letter upper case formatAction: true, // default true, format the action to Action
method: 'GET', // set the http method, default is GET formatParams: true, // default true, format the parameter name to first letter upper case
headers: {}, // set the http request headers method: 'GET', // set the http method, default is GET
}); headers: {}, // set the http request headers
});
this.pushlogSve.createDb({
op: "推送阿里信息返回：" + action,
content: JSON.stringify(obj),
resultInfo: JSON.stringify(res),
returnType: '1',
logLevel:'1',
opTitle: "推送阿里信息返回成功"
});
return system.getResultSuccess(res);
} catch (e) {
this.pushlogSve.createDb({
op: "推送阿里信息返回：" + action,
content: JSON.stringify(obj),
resultInfo: JSON.stringify(e.stack),
returnType: '0',
logLevel:'3',
opTitle: "推送阿里信息返回异常"
});
return system.getResultFail(-200, "出现异常，error：" + e.stack);
}
} }
} }
......
center-channel/app/front/entry/public/apidoc/platform/icbcOrder.md
...@@ -134,6 +134,7 @@ ...@@ -134,6 +134,7 @@
"orderNo":null, "orderNo":null,
"solutionContent":{ "solutionContent":{
"bizType":"esp.companyreg", "bizType":"esp.companyreg",
"notes":"用户反馈",
"solution":{ "solution":{
} }
......
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