Skip to content

Z
zhichan
Commit a9b342f5 by 兰国旗
Options

laolan

parent 8958cc56
Showing with 54 additions and 68 deletions
center-channel/app/base/api/impl/action/qcapi.js
...@@ -58,9 +58,6 @@ class QcAPI extends APIBase { ...@@ -58,9 +58,6 @@ class QcAPI extends APIBase {
// --------- 网文 --------- // --------- 网文 ---------
case "ncGetNeedList"://查询需求列表(网文)2020-11-11
opResult = await this.ncSve.ncGetNeedList(pobj);
break;
case "ncSubmitMaterial"://交付材料提交(网文)2020-11-11 case "ncSubmitMaterial"://交付材料提交(网文)2020-11-11
opResult = await this.ncSve.ncSubmitMaterial(pobj); opResult = await this.ncSve.ncSubmitMaterial(pobj);
break; break;
...@@ -70,27 +67,10 @@ class QcAPI extends APIBase { ...@@ -70,27 +67,10 @@ class QcAPI extends APIBase {
case "ncSubmitSolution"://提交方案(网文)2020-11-11 case "ncSubmitSolution"://提交方案(网文)2020-11-11
opResult = await this.ncSve.ncSubmitSolution(pobj); opResult = await this.ncSve.ncSubmitSolution(pobj);
break; break;
case "ncWriteCommunicationRecord"://提交沟通记录(网文)2020-11-11
opResult = await this.ncSve.ncWriteCommunicationRecord(pobj);
break;
case "ncGetCommunicationRecord"://查询沟通记录(网文)2020-11-11
opResult = await this.ncSve.ncGetCommunicationRecord(pobj);
break;
case "ncCloseNeed"://关闭需求(网文)2020-11-11
opResult = await this.ncSve.ncCloseNeed(pobj);
break;
case "ncClosePlan"://关闭方案(网文)2020-11-11
opResult = await this.ncSve.ncClosePlan(pobj);
break;
case "ncCloseOrderDelivery"://关闭交付单(网文)2020-11-11
opResult = await this.ncSve.ncCloseOrderDelivery(pobj);
break;
// --------- 广电 --------- // --------- 广电 ---------
case "rtGetNeedList"://查询需求列表(广电)2020-11-11
opResult = await this.rtSve.rtGetNeedList(pobj);
break;
case "rtSubmitMaterial"://交付材料提交(广电)2020-11-11 case "rtSubmitMaterial"://交付材料提交(广电)2020-11-11
opResult = await this.rtSve.rtSubmitMaterial(pobj); opResult = await this.rtSve.rtSubmitMaterial(pobj);
break; break;
...@@ -100,23 +80,8 @@ class QcAPI extends APIBase { ...@@ -100,23 +80,8 @@ class QcAPI extends APIBase {
case "rtSubmitSolution"://提交方案(广电)2020-11-11 case "rtSubmitSolution"://提交方案(广电)2020-11-11
opResult = await this.rtSve.rtSubmitSolution(pobj); opResult = await this.rtSve.rtSubmitSolution(pobj);
break; break;
case "rtWriteCommunicationRecord"://提交沟通记录(广电)2020-11-11
opResult = await this.rtSve.rtWriteCommunicationRecord(pobj);
break;
case "rtGetCommunicationRecord"://查询沟通记录(广电)2020-11-11
opResult = await this.rtSve.rtGetCommunicationRecord(pobj);
break;
case "rtCloseNeed"://关闭需求(广电)2020-11-11
opResult = await this.rtSve.rtCloseNeed(pobj);
break;
case "rtClosePlan"://关闭方案(广电)2020-11-11
opResult = await this.rtSve.rtClosePlan(pobj);
break;
case "rtCloseOrderDelivery"://关闭交付单(广电)2020-11-11
opResult = await this.rtSve.rtCloseOrderDelivery(pobj);
break;
// --------- 推送icp信息至渠道和作方 zhuangbing-20201116-------- // --------- 推送icp信息至渠道和作方 zhuangbing-20201116--------
case "pushIcpSolution2Channel"://推送ICP方案至渠道（百度） case "pushIcpSolution2Channel"://推送ICP方案至渠道（百度）
opResult = await this.baseOrderSve.pushIcpSolution2Channel(pobj); opResult = await this.baseOrderSve.pushIcpSolution2Channel(pobj);
break; break;
......
center-channel/app/base/api/impl/icp/queueNotify.js
...@@ -26,6 +26,12 @@ class QueueNotify extends APIBase { ...@@ -26,6 +26,12 @@ class QueueNotify extends APIBase {
case "pushIcpSolution2Channel"://推送ICP方案至渠道（百度） case "pushIcpSolution2Channel"://推送ICP方案至渠道（百度）
opResult = await this.baseOrderSve.pushIcpSolution2Channel(pobj); opResult = await this.baseOrderSve.pushIcpSolution2Channel(pobj);
break; break;
case "serviceProviderSubmit2Material"://推送资料至渠道（百度）
opResult = await this.baseOrderSve.serviceProviderSubmit2Material(pobj);
break;
case "serviceProvider2Notification"://推送通知状态至渠道（百度）
opResult = await this.baseOrderSve.serviceProvider2Notification(pobj);
break;
default: default:
opResult = system.getResult(null, "action_type参数错误"); opResult = system.getResult(null, "action_type参数错误");
break; break;
......
center-channel/app/base/service/impl/common/signSve.js
...@@ -113,13 +113,36 @@ class SignService{ ...@@ -113,13 +113,36 @@ class SignService{
} }
} }
module.exports = SignService; module.exports = SignService;
// var task = new SignService();
// var task = new SignService();
// var obj = { // var obj = {
// "intentionBizId": "TRE-vLTWoPv99nfceshishuju2", // "actionType": "serviceProviderSubmitMaterial",
// "description": "测试用户关闭2", // "actionBody": {
// "intentionStatus": 5 // "uapp_id":44,
// }; // "isTest":1,
// "orderNo":"OT442020112419480gtI",
// "material":{
// "BusinessLicense":{
// "Address":"x",
// "BusinessTerm":"x-x",
// "CreatedAt":"2020-11-17",
// "EnterpriseCode":"x",
// "LegalRepresentative":"x",
// "Name":"测试 百度渠道",
// "RegisteredCapital":"10",
// "ScopeBusiness":"x",
// "Type":"x"
// },
// "Domain":"x.com",
// "CorporateName":"x",
// "IncludeForeignInvestment":true,
// "PartnerBusinessLicense":"https://gsb-zc.oss-cn-beijing.aliyuncs.com//zc_3610160464935869220206155558692.jpeg",
// "PartnerIdCardList":["https://gsb-zc.oss-cn-beijing.aliyuncs.com//zc_463101604649363092202061556392.jpeg"],
// "PartnerDomainCertificate":"https://gsb-zc.oss-cn-beijing.aliyuncs.com//zc_4481016046493695182020615569518.jpeg",
// "PartnerPreviewOtherList":["https://gsb-zc.oss-cn-beijing.aliyuncs.com//zc_24710160464940618020206155646180.zip"]
// }
// }
// }
// task.createSign(obj,"7cbb892450174167b5c7e01we4716t51").then(d=>{ // task.createSign(obj,"7cbb892450174167b5c7e01we4716t51").then(d=>{
// console.log(d,"!!!!!!!!!!!!!!!!!!!!!!!!!!"); // console.log(d,"!!!!!!!!!!!!!!!!!!!!!!!!!!");
// }); // });
......
center-channel/app/base/service/impl/utilsSve/utilsNeedSve2.js
...@@ -511,7 +511,7 @@ class UtilsNeedService2 extends AppServiceBase { ...@@ -511,7 +511,7 @@ class UtilsNeedService2 extends AppServiceBase {
var result = await this.restPostUrl(pobj, reqUrl); var result = await this.restPostUrl(pobj, reqUrl);
//2020-10-28 laolan start //2020-10-28 laolan start
if (result && result.status == 0 && result.data) { if (result && result.status == 0 && result.data) {
if (result.data == uappId.aliConfirmResult) { if (result.data == uappId.ali) {
var res = await self.aliclient.reqbyget({ action: "writeCommunicationLog", reqbody: { BizId: pobj.actionBody.intentionBizId, Note: pobj.actionBody.note }, apiVersion: "2019-05-08" }); var res = await self.aliclient.reqbyget({ action: "writeCommunicationLog", reqbody: { BizId: pobj.actionBody.intentionBizId, Note: pobj.actionBody.note }, apiVersion: "2019-05-08" });
console.log("ali+res", res) console.log("ali+res", res)
} }
...@@ -544,14 +544,8 @@ class UtilsNeedService2 extends AppServiceBase { ...@@ -544,14 +544,8 @@ class UtilsNeedService2 extends AppServiceBase {
return system.getResultSuccess(); return system.getResultSuccess();
} }
//2020-10-28 laolan start
async queryExpertApplyCommunicationLogs(pobj) { async queryExpertApplyCommunicationLogs(pobj) {
// if (!pobj.actionBody.intentionBizId) {
// return system.getResult(null, "actionBody.intentionBizId can not be empty，100493");
// }
// if (!pobj.actionBody.userFeedBack) {
// return system.getResult(null, "actionBody.userFeedBack can not be empty，100494");
// }
//2020-10-28 laolan start
var reqUrl = this.centerOrderUrl + "action/need/springBoard"; var reqUrl = this.centerOrderUrl + "action/need/springBoard";
var result = await this.restPostUrl(pobj, reqUrl); var result = await this.restPostUrl(pobj, reqUrl);
console.log('jilu+++result++++', result) console.log('jilu+++result++++', result)
...@@ -582,16 +576,6 @@ class UtilsNeedService2 extends AppServiceBase { ...@@ -582,16 +576,6 @@ class UtilsNeedService2 extends AppServiceBase {
} }
} }
// 2020 0820 lin 新增 拉去有跟进信息的需求但 并 记录
// console.log(pobj.actionBody.intentionBizId,res.data.TotalItemNum)
// if(res.data.TotalItemNum > 0) {
// var sql = "update testneed set status=1 where channelNeedNo=:channelNeedNo"
// var paramWhere = {
// channelNeedNo: pobj.actionBody.intentionBizId
// };
// var updateRes = await this.utilsneedSve.dao.customUpdate(sql, paramWhere);
// }
// func();
if(res && res.data && res.data.result){ if(res && res.data && res.data.result){
res.data['Data'] = res.data.result res.data['Data'] = res.data.result
} }
......
center-channel/app/base/utils/baiduClient.js
...@@ -24,7 +24,15 @@ class baiduClient { ...@@ -24,7 +24,15 @@ class baiduClient {
let extime = 1800; let extime = 1800;
let canonicalHeaders = "host:"+this.baiduClientParams.host; let canonicalHeaders = "host:"+this.baiduClientParams.host;
//中间结果1：规范化请求和前缀字符串 //中间结果1：规范化请求和前缀字符串
let canonicalRequest = "POST" + "\n" + path + "\n" + "\n" + canonicalHeaders; var canonicalRequest = null
var pathParams = path.split("?");
if(pathParams && pathParams.length > 1){
canonicalRequest = "POST" + "\n" + pathParams[0] + "\n" + pathParams[1] + "\n" + canonicalHeaders;
}else{
canonicalRequest = "POST" + "\n" + path + "\n" + "\n" + canonicalHeaders;
}
// let canonicalRequest = "POST" + "\n" + path + "\n" + "\n" + canonicalHeaders;
console.log('canonicalRequest+++++++',canonicalRequest)
//authStringPrefix(前缀字符串，由除sk字段外的签名信息生成) //authStringPrefix(前缀字符串，由除sk字段外的签名信息生成)
let authStringPrefix = version+"/"+accessKey+"/"+timestamp+"/"+extime; let authStringPrefix = version+"/"+accessKey+"/"+timestamp+"/"+extime;
//中间结果2：派生签名密钥 signingKey //中间结果2：派生签名密钥 signingKey
......
center-channel/app/config/businessConfig.js
...@@ -14,8 +14,8 @@ module.exports = { ...@@ -14,8 +14,8 @@ module.exports = {
"orderTotalSum", "collect", "reg", "orderCheck", "getReOrderList", "getOfficalList", "addReviewList", "opSubmitNeed", "opNeedClose", "opNeedList", "orderTotalSum", "collect", "reg", "orderCheck", "getReOrderList", "getOfficalList", "addReviewList", "opSubmitNeed", "opNeedClose", "opNeedList",
"getItemByNeedNo", "opNeedDetailByChannelNo", "getNeedListUser", "manualEvaluation", "diagnosisInfo", "check", "enterpriseInfo", "diagnosisDetail", "getItemByNeedNo", "opNeedDetailByChannelNo", "getNeedListUser", "manualEvaluation", "diagnosisInfo", "check", "enterpriseInfo", "diagnosisDetail",
"submitIcpIntention", "queryIntentionList", "confirmIcpIntention", "tmAccept", "tmStatus", "needBatchUpload", "submitIcpIntention", "queryIntentionList", "confirmIcpIntention", "tmAccept", "tmStatus", "needBatchUpload",
"ncSubmitMaterial","ncNotification","ncSubmitSolution","ncWriteCommunicationRecord","ncGetCommunicationRecord","ncCloseNeed","ncClosePlan","ncCloseOrderDelivery", "ncSubmitMaterial","ncNotification","ncSubmitSolution","ncCloseNeed","ncClosePlan",
"rtSubmitMaterial","rtNotification","rtSubmitSolution","rtWriteCommunicationRecord","rtGetCommunicationRecord","rtCloseNeed","rtClosePlan","rtCloseOrderDelivery", "rtSubmitMaterial","rtNotification","rtSubmitSolution","rtCloseNeed","rtClosePlan",
"getParamsFor360", "addOrderWeb", "getPayRecords", "getLoginInfo", "putUserMobileByVcode", "getParamsFor360", "addOrderWeb", "getPayRecords", "getLoginInfo", "putUserMobileByVcode",
"putUserPwdByMobile", "icpNotifyNew" "putUserPwdByMobile", "icpNotifyNew"
], ],
...@@ -23,8 +23,8 @@ module.exports = { ...@@ -23,8 +23,8 @@ module.exports = {
"icpOrderClose", "icpOrderClose",
"submitNeed", "paySuccess", "icpNotify", "getLoginInfo", "icpNotifyNew", "submitIcpProgramme","serviceProviderSubmitMaterial","abolishIcpProgramme", "submitNeed", "paySuccess", "icpNotify", "getLoginInfo", "icpNotifyNew", "submitIcpProgramme","serviceProviderSubmitMaterial","abolishIcpProgramme",
"submitService","serviceProviderNotification", "submitService","serviceProviderNotification",
"ncGetNeedList","ncSubmitMaterial","ncNotification","ncSubmitSolution","ncWriteCommunicationRecord","ncGetCommunicationRecord","ncCloseNeed","ncClosePlan","ncCloseOrderDelivery", "ncSubmitMaterial","ncNotification","ncSubmitSolution","ncCloseNeed","ncClosePlan",
"rtGetNeedList","rtSubmitMaterial","rtNotification","rtSubmitSolution","rtWriteCommunicationRecord","rtGetCommunicationRecord","rtCloseNeed","rtClosePlan","rtCloseOrderDelivery", "rtSubmitMaterial","rtNotification","rtSubmitSolution","rtCloseNeed","rtClosePlan",
], ],
apiSecretPathList: ["/api/icp/consultation/submit","/api/icp/feedback/submit","/api/icp/order/notify","/api/opreceive/service/create","/api/icp/order/close","/api/opreceive/service/notify","/api/icp/queueNotify/springBoard",] apiSecretPathList: ["/api/icp/consultation/submit","/api/icp/feedback/submit","/api/icp/order/notify","/api/opreceive/service/create","/api/icp/order/close","/api/opreceive/service/notify","/api/icp/queueNotify/springBoard",]
} }
......
center-channel/app/config/localsettings.js
var settings = { var settings = {
redis: { redis: {
host: "121.36.3.35", host: "39.107.234.14",
port: 8967, port: 6379,
password: "Gongsibao2018", password: "123123",
db: 4, db: 4,
}, },
database: { database: {
......
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