Skip to content

Z
zhichan
Commit 7bdf0f86 by 任晓松
Options

Merge remote-tracking branch 'origin/center-channel' into center-channel

parents 05cc83a2 8a06ad99
Showing with 173 additions and 18 deletions
center-channel/app/base/api/impl/icp/feedback.js
......@@ -51,12 +51,13 @@ class Feedback extends APIBase {
if (!pobj.intentionStatus) {
return self.getResultFail("intentionStatus不能为空");
}
pobj.action_type = "icpFeedbackSubmitNew";
var param = {
requestId: req.requestId || self.getUUID(),
requestUrl: "/icp/feedback/submit",
requestjson: JSON.stringify(pobj),//请求地址
pushUrl: "/action/intentionapi/springBoard",//调用地址
pushActionType: "icpFeedbackSubmit",//调用参数
pushActionType: "icpFeedbackSubmitNew",//调用参数
pushtimes: 0,//推送次数
pushStatus: "wts",//推送状态
}
......
center-channel/app/base/api/impl/icp/order.js
......@@ -67,6 +67,118 @@ class Order extends APIBase {
}
}
pobj.action_type = "icpOrderStatus";
if (pobj.area) {
switch (pobj.area) {
case "BEIJING":
pobj.area = "1";
break;
case "SHANGHAI":
pobj.area = "2";
break;
case "FUJIAN":
pobj.area = "3";
break;
case "GUANGXI":
pobj.area = "4";
break;
case "GUANGDONG":
pobj.area = "5";
break;
case "ANHUI":
pobj.area = "6";
break;
case "HENAN":
pobj.area = "7";
break;
case "HUBEI":
pobj.area = "8";
break;
case "ZHEJIANG":
pobj.area = "9";
break;
case "JIANGSU":
pobj.area = "10";
break;
case "SHANDONG":
pobj.area = "11";
break;
case "SHANGXI_SHAN":
pobj.area = "12";
break;
case "NINGXIA":
pobj.area = "13";
break;
case "GANSU":
pobj.area = "14";
break;
case "XINJIANG":
pobj.area = "15";
break;
case "QINGHAI":
pobj.area = "16";
break;
case "TIANJIN":
pobj.area = "17";
break;
case "CHONGQING":
pobj.area = "18";
break;
case "HEBEI":
pobj.area = "19";
break;
case "SHANXI_JIN":
pobj.area = "20";
break;
case "LIAONING":
pobj.area = "21";
break;
case "JINLIN":
pobj.area = "22";
break;
case "HEILONGJIANG":
pobj.area = "23";
break;
case "JIANGXI":
pobj.area = "24";
break;
case "HUNAN":
pobj.area = "25";
break;
case "SICHUAN":
pobj.area = "26";
break;
case "GUIZHOU":
pobj.area = "27";
break;
case "YUNNAN":
pobj.area = "28";
break;
case "NEIMENGGU":
pobj.area = "29";
break;
case "XIZANG":
pobj.area = "30";
break;
case "HANWAIZI":
pobj.area = "31";
break;
case "QUANWAIZI":
pobj.area = "31";
break;
case "WAIZI":
pobj.area = "31";
break;
case "HAINAN":
pobj.area = "34";
break;
default:
pobj.area = "";
break;
}
}
if (!pobj.area) {
return self.getResultFail("area参数错误");
}
var param = {
requestId: req.requestId || self.getUUID(),
requestUrl: "/icp/order/notify",
......@@ -80,5 +192,28 @@ class Order extends APIBase {
return self.getResultSuccess(param.requestId);
}
async close(pobj,obj,req){
var self = this;
if(!pobj.appInfo || !pobj.appInfo.uapp_key || !pobj.appInfo.uapp_secret){
return self.getResultFail("未知应用或应用未启用");
}
if (!pobj.orderNo) {
return self.getResultFail("orderNo不能为空");
}
pobj.channelOrderNo = pobj.orderNo;
pobj.action_type = "icpOrderClose";
var param = {
requestId: req.requestId || self.getUUID(),
requestUrl: "/icp/order/close",
requestjson: JSON.stringify(pobj),//请求地址
pushUrl: "/action/intentionapi/springBoard",//调用地址
pushActionType: "icpOrderClose",//调用参数
pushtimes: 0,//推送次数
pushStatus: "wts",//推送状态
}
await self.gatewaypushlogSve.create(param);
return self.getResultSuccess(param.requestId);
}
}
module.exports = Order;
\ No newline at end of file
center-channel/app/base/api/impl/opreceive/need.js
......@@ -105,6 +105,9 @@ class Need extends APIBase {
opResult = await self.centerorderSve.icppaysuccessNew(pobj, pobj.actionBody);
}
break;
case "icpOrderClose"://关闭ICP订单
opResult = await this.utilsNeedSve.icpOrderClose(pobj, pobj.actionBody);
break;
//-----------接入百度ICP------end----------------------------------
default:
opResult = system.getResult(null, "action_type参数错误");
......
center-channel/app/base/service/impl/common/signSve.js
......@@ -104,7 +104,7 @@ class SignService{
}
}
module.exports = SignService;
var task = new SignService();
// var task = new SignService();
// var obj = {
// "intentionBizId": "TRE-nmnHtEoTjeEtest",
......@@ -119,21 +119,9 @@ var task = new SignService();
// });
// var obj = {
// "bizId":"202011031421",
// "contactName":"lin",
// "contactMobile":"13911391996",
// "timeUnit":"year",
// "quantity":1,
// "companyInfo":{
// "companyName":"公司宝",
// "taxpayerType":"NORMAL_TAXPAYER",
// "acctgSystemId":"10001",
// "companyForm":"1",
// "industry":"1",
// "taxpayerNumber":"123456789",
// "companyArea":"北京"
// }
// "orderNo":"c76a7c1a0cf747db92e9fc6beab770f0",
// "remark":"lin"
// }
// task.createSign(obj,"7cbb892450174167b5c7e01we4717z51").then(d=>{
// task.createSign(obj,"7cbb892450174167b5c7e01we4716t51").then(d=>{
// console.log(d,"!!!!!!!!!!!!!!!!!!!!!!!!!!");
// });
\ No newline at end of file
center-channel/app/base/service/impl/utilsSve/utilsNeedSve.js
......@@ -1431,6 +1431,32 @@ class UtilsNeedService extends AppServiceBase {
}//通知更新状态
return rtn;
}
//关闭icp订单
async icpOrderClose(pobj) {
var actionBody = pobj.actionBody;
var self = this;
var url = settings.centerOrderUrl() + "action/qcapi/springBoard";
var rtn = await this.restPostUrl(pobj, url);
if (rtn.status == 0 && rtn.data) {
pobj.actionBody.orderNo = rtn.data.orderNo;
var orderrtn = await self.utilsOrderSve.delOrder(pobj, pobj.actionBody);
if (orderrtn.status < 0) {
return system.getResultFail(-5022, "订单关闭失败");
}
var tmpObj = {
actionBody: {
orderNo: rtn.data.orderNo,
channelNeedNo: rtn.data.channelNeedNo,
needsolution: rtn.data.solutionContent
},
appInfo: pobj.appInfo
}
this.utilsPushSve.baiduBusiness2Delivery(tmpObj, "pushDeliveryStatusNotify");
tmpObj.actionBody.orderNo = rtn.data.channelSolutionNo;
self.utilsPushSve.baiduBusiness2Fq(tmpObj, "pushOrderICPClose");
}//通知更新状态
return rtn;
}
//-----------接入百度ICP------end----------------------------------
}
......
center-channel/app/config/businessConfig.js
......@@ -19,6 +19,6 @@ module.exports = {
"putUserPwdByMobile", "icpNotifyNew"
],
apiMustUserpinList: ["submitNeed", "paySuccess", "icpNotify", "getLoginInfo", "icpNotifyNew", "submitIcpProgramme","serviceProviderSubmitMaterial","abolishIcpProgramme","submitService"],
apiSecretPathList: ["/api/icp/consultation/submit","/api/icp/feedback/submit","/api/icp/order/notify","/api/opreceive/service/create"]
apiSecretPathList: ["/api/icp/consultation/submit","/api/icp/feedback/submit","/api/icp/order/notify","/api/opreceive/service/create","/api/icp/order/close"]
}
}
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