Skip to content

Z
zhichan
Commit 97af5cb9 by 宋毅
Options

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

parents 2593f63e 4f517f0e
Showing with 158 additions and 9 deletions
center-channel/app/base/api/impl/action/icpapi.js
......@@ -31,6 +31,9 @@ class IcpAPI extends APIBase {
async opActionProcess(pobj, action_type, req) {
var opResult = null;
switch (action_type) {
case "getNeedSolutionDetailByUser"://获取方案详情
opResult = await this.centerorderSve.reqCenterOrderApi(pobj,"action/icpapi/springBoard");
break;
case "submitIcpProgramme"://icp方案提交
opResult = await this.centerorderSve.submitIcpProgramme(pobj);
break;
......
center-channel/app/base/service/impl/common/centerorderSve.js
......@@ -9,6 +9,7 @@ class CenterorderService {
this.cacheManager = system.getObject("db.common.cacheManager");
this.utilsOrderSve = system.getObject("service.utilsSve.utilsOrderSve");
this.utilsPushSve = system.getObject("service.utilsSve.utilsPushSve");
this.utilsTmAliyunSve = system.getObject("service.utilsSve.utilsTmAliyunSve");//测试用
};
//调用center-order
async reqCenterOrderApi(pobj, reqUrl) {
......@@ -208,7 +209,10 @@ class CenterorderService {
if(typeof(ab.solutionContent) == "string"){
ab.solutionContent = JSON.parse(ab.solutionContent);
}
var solution = ab.solutionContent.solution;
if(typeof(needsolution.solutionContent) == "string"){
needsolution.solutionContent = JSON.parse(needsolution.solutionContent);
}
var solution = needsolution.solutionContent.solution;
//推送数据至阿里
var bizType = needinfo.channelTypeCode;//业务类型里
var pushObj = {
......@@ -218,13 +222,47 @@ class CenterorderService {
};
var self = this;
//推送方案
// this.pushSubmitSolution(pushObj,needsolution.solutionNo,pobj.appInfo,self);
// this.pushIcpSolution(pushObj,needsolution.solutionNo,pobj.appInfo,self);
return system.getResultSuccess();
}
return res;
}
//推送ICP方案
async pushIcpSolution(pushObj,solutionNo,appInfo,self){
//推送方案信息
var pushRes = await self.aliclient.reqbyget({action:"SubmitIcpSolution",reqbody:pushObj,apiVersion:"2019-05-08"});
if(pushRes && pushRes.status==0 && pushRes.data){
var resData = pushRes.data;
if(resData.BizId){
var reqObj2 = {
actionType:"receiveProgrammeNo",
appInfo:appInfo,
actionBody:{
solutionNo:solutionNo,
solutionBizId:resData.BizId
}
};
var a = await self.reqCenterOrderApi(reqObj2);//保存渠道方案id
if(a && a.status==0){
//推送方案确认信息
await self.aliclient.reqbyget({action:"ConfirmIntention",reqbody:{BizId:resData.BizId}});
}
}
}
}
//材料链接转换
async materialUrlConversion(pobj){
// if(!pobj || !pobj.actionBody || !pobj.actionBody.material){
// return pobj;
// }
// var material = pobj.actionBody.material;
// if(material.PartnerBusinessLicense){//营业执照
// var aliPartnerBusinessLicense = await this.utilsTmAliyunSve.getAliOssFileUrl("trade-mark-user-upload", pobj, this.utilsTmAliyunSve.aliOssFileType.BUSINESS_LICENSE, material.PartnerBusinessLicense, rpcParam);
// }
}
//icp材料提交
async submitIcpMaterial(pobj) {
// pobj = await this.materialUrlConversion(pobj);
var res = await this.reqCenterOrderApi(pobj,"action/icpapi/springBoard");
if(res && res.status==0 && res.data){
var needsolution = res.data;//方案信息
......@@ -233,7 +271,7 @@ class CenterorderService {
ab.material = JSON.parse(ab.material);
}
var material = ab.material;
//推送数据至阿里
//推送数据至阿里
var BizId = ab.BizId;//⽅案业务ID
var pushObj = {
"BizId":BizId,
......@@ -252,8 +290,8 @@ class CenterorderService {
"PartnerSignAndStampOtherList":material.PartnerSignAndStampOtherList || []
};
var self = this;
//推送方案
// this.pushSubmitSolution(pushObj,needsolution.solutionNo,pobj.appInfo,self);
//推送方案材料
// self.aliclient.reqbyget({action:"SavePartnerSubmitMaterial",reqbody:pushObj});
return system.getResultSuccess();
}
return res;
......@@ -266,7 +304,7 @@ class CenterorderService {
//推送数据至阿里
var pushObj = res.data;
//推送方案
// this.pushSubmitSolution(pushObj,needsolution.solutionNo,pobj.appInfo,self);
//this.aliclient.reqbyget({action:"AcceptPartnerNotification",reqbody:pushObj});
return system.getResultSuccess();
}
return res;
......@@ -285,7 +323,7 @@ class CenterorderService {
BizId:ab.BizId,Note:ab.Note
};
//推送方案
// this.pushSubmitSolution(pushObj,needsolution.solutionNo,pobj.appInfo,self);
//this.aliclient.reqbyget({action:"CloseIcpProduce",reqbody:pushObj});
return system.getResultSuccess();
}
return res;
......
center-channel/app/base/utils/aliyunClient.js
......@@ -30,7 +30,7 @@ class aliyunClient {
var action = obj.action;
var reqbody = obj.reqbody;
try {
if (rpcParam.apiVersion) {
if (obj.apiVersion) {
this.aliclient.apiVersion = obj.apiVersion;
}
var res = await this.aliclient.request(action, reqbody, {
......
center-channel/app/config/routes/api.js
......@@ -109,7 +109,7 @@ module.exports = function (app) {
}
req.body.appInfo = result.data;
req.body.actionProcess = result.data.app_code;
var lst = ["tmConfirm",
var lst = ["tmConfirm","getNeedSolutionDetailByUser",
"submitIcpProgramme","submitIcpMaterial","acceptIcpPartnerNotification","abolishIcpProgramme",
"addOrder", "getH5PayUrl", "getOrderQrCode", "queryOrderStatus", "getOrderInfo", "getOrderDeliveryInfo", "getOrderDetails",
"getOrderDeliveryFlowInfo", "getOrderDeliveryFlowList", "getOrderLogInfo", "updateContacts", "updateTmOrder", "delOrder",
......
center-channel/app/front/entry/public/apidoc/platform/icpOrder.md
......@@ -5,6 +5,7 @@
1. [根据需求产看方案详情](#getProgrammeInfoByNeedNo)
1. [icp通知状态变更](#acceptIcpPartnerNotification)
1. [服务商关闭icp方案](#abolishIcpProgramme)
1. [获取方案详情](#getNeedSolutionDetailByUser)
## **<a name="submitIcpProgramme"> icp方案提交</a>**
[返回到目录](#menu)
......@@ -202,3 +203,110 @@ ApplicationStatus：
"requestId":"40769e74e83f4505a78b24d84fed870b"
}
```
## **<a name="getNeedSolutionDetailByUser"> 获取方案详情</a>**
[返回到目录](#menu)
##### URL
[/web/action/icapi/springBoard]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
#### 请求头中需要增加userpin（用户登录后的凭证）的值
#### 渠道执行的类型 actionType：getNeedSolutionDetailByUser
``` javascript
{
"actionType":"getNeedSolutionDetailByUser",
"actionBody":{
"solutionNo":"NS202004131008iKPRDB"
}
}
```
#### 返回结果
```javascript
{
"status":0,
"msg":"success",
"data":[
{
"id":230,
"channelNeedNo":"I20200320201737000221",//渠道需求号
"needNo":"N202004111217gD5T8TJ",//需求号
"solutionNo":"NS202004131349EAWwSV",//方案号
"channelSolutionNo":"S20200323174838000zhb7",//渠道方案号 同BizId
"orderNo":null,//服务订单号
"solutionContent":{//方案交付信息
"notes":"",//用户反馈备注
"status":"ACCOUNT_REGISTERED",//方案流程状态
"bizType":"icpsq",//操作类型
"material":{//材料信息
"Domain":"备案域名",
"PartnerLaw":"依法经营电信业务承诺书",
"PartnerPlan":"收费方案计划书",
"CorporateName":"法人名称",
"PartnerIdCardList":[
"相关人员身份证"
],
"PartnerSignOtherList":[
"需要签字，只能传递1个zip包"
],
"PartnerStampOtherList":[
"需要盖章，只能传递1个zip包"
],
"PartnerBusinessLicense":"营业执照",
"PartnerPreviewOtherList":[
"合作方递交其他供预览的件，只能传递ZIP包"
],
"IncludeForeignInvestment":true,
"PartnerDomainCertificate":"域名证书",
"PartnerForeignInvestment":"股东追溯不涉及外资承诺书",
"PartnerSignAndStampOtherList":[
"需要盖章，只能传递1个zip包"
]
},
"solution":{//方案信息
"Area":"区域222",
"Note":"备注222",
"IcpType":"icp",
"CompanyName":"公司名测试数据222",
"CompanyAddress":"公司地址222"
},
"totalSum":"",//订单金额
"typeCode":"icpsq",//产品码
"typeName":"icp申请",//产品名称
"statusName":"完成账户注册",//流程状态名称
"solutionFlowList":[//方案流程列表
{
"status":"ACCOUNT_REGISTERED",
"statusName":"完成账户注册",
"updated_at":"2020-04-13T05:51:08.790Z"
}
],
"applicationStatusList":[//方案通知状态列表 ---- 未用到
{
"created_at":"2020-04-13T05:49:19.750Z",
"OfficialFileURL":"",
"ApplicationStatus":"submitIcpProgramme",
"ApplicationStatusName":"提交方案"
},
{
"created_at":"2020-04-13T05:51:08.790Z",
"OfficialFileURL":"",
"ApplicationStatus":"507",
"ApplicationStatusName":"507"
}
]
},
"status":"dqr",//方案状态
"statusName":"待确认",//方案状态
"createUserId":100,
"created_at":"2020-04-13T05:49:19.000Z",
"updated_at":"2020-04-13T05:51:08.000Z",
"deleted_at":null,
"version":0
}
],
"requestId":"1594aa8fabfd42eba332160263b2597e"
}
```
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