Skip to content

Z
zhichan
Commit e1e70f48 by linboxuan
Options

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

parents 87c98ee2 222aa53f
Showing with 375 additions and 18 deletions
center-channel/app/base/api/impl/opaction/tmReview.js
...@@ -33,16 +33,19 @@ class tmReview extends WEBBase { ...@@ -33,16 +33,19 @@ class tmReview extends WEBBase {
case "getOfficalList"://获取官文列表 case "getOfficalList"://获取官文列表
opResult = await this.utilsDeliverSve.getOfficialList(pobj,pobj.actionBody); opResult = await this.utilsDeliverSve.getOfficialList(pobj,pobj.actionBody);
break; break;
case "receiveDeliveryData"://接收交付中心交付数据 case "composeDocAndDownload"://事实与理由模板下载
opResult = await this.utilsDeliverSve.receiveDeliveryInfo(pobj,pobj.actionBody);
break;
case "composeDocAndDownload":
opResult = await this.utilsDeliverSve.composeDocAndDownload(pobj,pobj.actionBody); opResult = await this.utilsDeliverSve.composeDocAndDownload(pobj,pobj.actionBody);
break; break;
case "getPDFInfo": case "getEntrustDoc"://
opResult = await this.utilsDeliverSve.getEntrustDoc(pobj,pobj.actionBody);
break;
case "getPDFInfo"://解析驳回通知书获取参数
opResult = await this.utilsDeliverSve.getPDFInfo(pobj,pobj.actionBody); opResult = await this.utilsDeliverSve.getPDFInfo(pobj,pobj.actionBody);
break; break;
case "addOfficial": case "receiveDeliveryData"://接收交付中心交付数据
opResult = await this.utilsDeliverSve.receiveDeliveryInfo(pobj,pobj.actionBody);
break;
case "addOfficial"://接收官文信息
opResult = await this.utilsDeliverSve.addOfficial(pobj,pobj.actionBody); opResult = await this.utilsDeliverSve.addOfficial(pobj,pobj.actionBody);
break; break;
default: default:
......
center-channel/app/base/service/impl/utilsSve/utilsDeliverSve.js
...@@ -224,7 +224,7 @@ class utilsDeliverSve extends AppServiceBase{ ...@@ -224,7 +224,7 @@ class utilsDeliverSve extends AppServiceBase{
} }
/** /**
* 合成模板并下载 * 合成模板 事实与理由
* @param pobj * @param pobj
* @param actionBody * @param actionBody
* @returns {Promise<void>} * @returns {Promise<void>}
...@@ -292,6 +292,42 @@ class utilsDeliverSve extends AppServiceBase{ ...@@ -292,6 +292,42 @@ class utilsDeliverSve extends AppServiceBase{
} }
return system.getResult(result.data); return system.getResult(result.data);
} }
/**
* 合成模板 委托书
* @param pobj
* @param actionBody
* @returns {Promise<void>}
*/
async getEntrustDoc(pobj,actionBody){
if(!actionBody.applyName){
return system.getResult(null,'applyName can not be empty');
}
if(!actionBody.addr){
return system.getResult(null,'addr can be not empty');
}
if(!actionBody.name){
return system.getResult(null,'name can be not empty');
}
if(!actionBody.duty){
return system.getResult(null,'duty can not be empty');
}
if(!actionBody.tm_name){
return system.getResult(null,'tm_name can be not empty');
}
if(!actionBody.type){
return system.getResult(null,'type can be not empty');
}
if(!actionBody.num){
return system.getResult(null, 'num can be not empty');
}
let url = this.fileDealUrl + '/gsb/tmassessagent';
let result =await this.restPostUrl(actionBody,url);
if(result.status !=1){
return system.getResultFail(-1,'合成失败！');
}
return system.getResult(result.data)
}
} }
module.exports = utilsDeliverSve; module.exports = utilsDeliverSve;
\ No newline at end of file
center-channel/app/base/service/impl/utilsSve/utilsNeedSve.js
...@@ -215,7 +215,8 @@ class UtilsNeedService extends AppServiceBase { ...@@ -215,7 +215,8 @@ class UtilsNeedService extends AppServiceBase {
} }
} }
// 推送ali // 推送ali
await self.aliclient.reqbyget({ action: "CloseIntention", reqbody: { BizId: actionBody.channelNeedNo, Note: actionBody.note }, apiVersion: "2019-05-08" }); var a=await self.aliclient.reqbyget({ action: "CloseIntention", reqbody: { BizId: actionBody.channelNeedNo, Note: actionBody.note }, apiVersion: "2019-05-08" });
console.log(a);
self.utilsPushSve.aliBusiness2Fq(pobj, "pushCloseICPNeed"); self.utilsPushSve.aliBusiness2Fq(pobj, "pushCloseICPNeed");
return system.getResultSuccess(); return system.getResultSuccess();
} else { } else {
...@@ -384,7 +385,8 @@ class UtilsNeedService extends AppServiceBase { ...@@ -384,7 +385,8 @@ class UtilsNeedService extends AppServiceBase {
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);
let res = await self.aliclient.reqbyget({ action: "WriteCommunicationLog", reqbody: { BizId: pobj.actionBody.intentionBizId, Note: pobj.actionBody.note }, apiVersion: "2019-05-08" }); let res = await self.aliclient.reqbyget({ action: "WriteCommunicationLog", reqbody: { BizId: pobj.actionBody.intentionBizId, Note: pobj.actionBody.note }, apiVersion: "2019-05-08" });
return result; console.log(res);
return system.getResultSuccess();
} }
async queryExpertApplyCommunicationLogs(pobj) { async queryExpertApplyCommunicationLogs(pobj) {
...@@ -394,19 +396,18 @@ class UtilsNeedService extends AppServiceBase { ...@@ -394,19 +396,18 @@ class UtilsNeedService extends AppServiceBase {
if (!pobj.actionBody.userFeedBack) { if (!pobj.actionBody.userFeedBack) {
return system.getResult(null, "actionBody.userFeedBack can not be empty，100494"); return system.getResult(null, "actionBody.userFeedBack can not be empty，100494");
} }
let res = await self.aliclient.reqbyget({ let res = await this.aliclient.reqbyget({
action: "queryExpertApplyCommunicationLogs", reqbody: { action: "QueryExpertApplyCommunicationLogs", reqbody: {
BeginTime: pobj.actionBody.BeginTime ? pobj.actionBody.BeginTime : "", BeginTime: pobj.actionBody.BeginTime ? pobj.actionBody.BeginTime : "",
EndTime: pobj.actionBody.EndTime ? pobj.actionBody.EndTime : "", EndTime: pobj.actionBody.EndTime ? pobj.actionBody.EndTime : "",
BizId: pobj.actionBody.intentionBizId, BizId: pobj.actionBody.intentionBizId,
UserFeedBack: pobj.actionBody.userFeedBack, UserFeedBack: pobj.actionBody.userFeedBack,
PageNum: pobj.actionBody.pageNum || 1, PageNum: pobj.actionBody.pageNum || 1,
PageSize: pobj.actionBody.pageSize || 10, PageSize: pobj.actionBody.pageSize || 10,
apiVersion: "2019-05-08" }, apiVersion: "2019-05-08"
}
}); });
console.log(res); console.log(res);
return res; return system.getResultSuccess(res);
} }
...@@ -430,7 +431,13 @@ class UtilsNeedService extends AppServiceBase { ...@@ -430,7 +431,13 @@ class UtilsNeedService extends AppServiceBase {
module.exports = UtilsNeedService; module.exports = UtilsNeedService;
// var a=new UtilsNeedService(); // var a=new UtilsNeedService();
// a.queryExpertApplyCommunicationLogs({intentionBizId:20200803095203000001,userFeedBack:true}); // a.queryExpertApplyCommunicationLogs({actionBody:{intentionBizId:"20200803095203000001",userFeedBack:true}});
// // var a=new UtilsNeedService();
// a.writeCommunicationLog({actionBody:{intentionBizId:"20200804200124000001",note:"测试反馈"}});
// var a=new UtilsNeedService();
// a.needCloseIcp({actionBody:{channelNeedNo:20200804200124000001,note:"ceshifankui"}},{channelNeedNo:20200803095203000001,note:"ceshifankui"});
center-channel/app/config/environment.js
...@@ -27,7 +27,7 @@ module.exports = function (app) { ...@@ -27,7 +27,7 @@ module.exports = function (app) {
app.all('*', function (req, res, next) { app.all('*', function (req, res, next) {
req.objs = system; req.objs = system;
res.header('Access-Control-Allow-Origin', '*'); res.header('Access-Control-Allow-Origin', '*');
res.header('Access-Control-Allow-Headers', 'Content-Type, Content-Length, Authorization, Accept, X-Requested-With , yourHeaderFeild,Authorization,XAPPKEY,XFROMAPPKEY,XFROMCOMPANYKEY,XREGROLE,XBIZPATH'); res.header('Access-Control-Allow-Headers', 'Content-Type, Content-Length, Authorization, Accept, X-Requested-With , yourHeaderFeild');
res.header('Access-Control-Allow-Methods', 'PUT, POST, GET, DELETE, OPTIONS'); res.header('Access-Control-Allow-Methods', 'PUT, POST, GET, DELETE, OPTIONS');
// res.header('Access-Control-Allow-Credentials', 'true'); // res.header('Access-Control-Allow-Credentials', 'true');
res.header('content-type', 'text/html;charset=UTF-8'); res.header('content-type', 'text/html;charset=UTF-8');
......
center-channel/app/front/entry/public/apidoc/README.md
...@@ -44,4 +44,13 @@ ...@@ -44,4 +44,13 @@
　　1 [Logo订单接口](doc/api/platform/logoOrder.md) 　　1 [Logo订单接口](doc/api/platform/logoOrder.md)
## 14. 复购商机相关接口 ## 14. 复购商机相关接口
　　1 [复购商机相关接口](doc/api/platform/fgbusinesschance.md) 　　1 [复购商机相关接口](doc/api/platform/fgbusinesschance.md)
\ No newline at end of file
## 15. 工商聚合相关接口
　　1 [工商聚合相关接口](doc/api/platform/icbcH5.md)
## 16 公司起名相关接口
　　1 [公司起名相关接口](doc/api/platform/companyNaming.md)
## 17. 商标驳回复审相关接口
　　1 [商标驳回复审相关接口](doc/api/platform/trademarkReview.md)
\ No newline at end of file
center-channel/app/front/entry/public/apidoc/platform/companyNaming.md 0 → 100644
<a name="menu" href="/doc">返回主目录</a>
1. [获取行业信息](#getCache)
1. [获取偏好信息](#getPreference)
1. [提交选择信息起名](#createName)
## **<a name="getCache">询价</a>**
[返回到目录](#menu)
##### URL
[/web/nmaction/name/springBoard]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
#### 渠道执行的类型 actionType：getCache
``` javascript
{}
```
#### 返回结果
``` javascript
{
"status": 0,
"msg": "操作成功",
"data": {
"cache": {
"科技类": [
"网络科技",
"电子商务",
"信息技术",
"游戏",
"电子",
"软件",
"新材料",
"生物科技",
"教育科技",
"环保科技",
"信息科技"
],
"许可类": [
"投资管理",
"金融",
"资产",
"商业保理",
"融资租赁",
"医疗器械",
"人力资源",
"食品",
"劳务派遣"
],
"服务类": [
"广告",
"文化传媒",
"建筑装潢",
"设计",
"美容美发",
"房地产中介",
"物业管理",
"商务咨询",
"企业管理"
],
"其他": [
"贸易",
"实业",
"制造",
"服饰",
"化妆品",
"工程",
"农业",
"餐饮管理",
"物流"
]
}
},
"bizmsg": "empty",
"requestId": "e57eb4e86d4b4b7f9a617ac322f9d6e7"
}
```
## **<a name="getPreference"> 获取偏好信息</a>**
[返回到目录](#menu)
##### URL
[/web/nmaction/name/springBoard]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
#### 渠道执行的类型 actionType：getPreference
``` javascript
{}
```
#### 返回结果
``` javascript
{
"status": 0,
"msg": "操作成功",
"data": {
"preference": [
[
"好未来",
"知乎",
"宝马",
"耐克"
],
[
"文思海辉",
"美的",
"跟谁学",
"旷世"
],
[
"肯德基",
"自如",
"步步高",
"迅雷"
],
[
"科大讯飞",
"田老师",
"迪奥",
"平安"
],
[
"百度",
"贝壳",
"欧莱雅",
"医渡云"
]
]
},
"bizmsg": "empty",
"requestId": "be8599efb38b47818f264e5538c4ea88"
}
```
## **<a name="createName"> 提交选择信息起名</a>**
[返回到目录](#menu)
##### URL
[/web/nmaction/name/springBoard]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
#### 渠道执行的类型 actionType：createName
``` javascript
{
"orderId": "123",//订单号
"province": "辽宁省",//省份
"city": "大连市",//城市
"county": "博野县",//县
"pcate": "父行业",//行业
"cate": "网络科技",//子行业
"preference": ["好未来", "文思海辉", "自如", "平安", "贝壳"]//偏好
}
```
#### 返回结果
``` javascript
{
"status":0,
"msg":"success",
"data":null,
"requestId":"9d37bc51318a413491c47b443e89f50e"
}
```
\ No newline at end of file
center-channel/app/front/entry/public/apidoc/platform/icbcH5.md 0 → 100644
<a name="menu" href="/doc">返回主目录</a>
1. [询价](#getProductPrice)
1. [创建订单](#addOrder)
1. [免费咨询](#submitNeedH5)
## **<a name="getProductPrice">询价</a>**
[返回到目录](#menu)
##### URL
[/web/action/product/springboard/]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
#### 渠道执行的类型 actionType：getProductPrice
``` javascript
{
channelItemCode: "gszc",//产品渠道码
city: "北京市",//城市
companyType: "有限责任公司",//公司性质
pathCode: "/gsfu/gszc/",//产品类型编码路径
productId: 60, //产品id
province: "北京市",//省份
serviceType: "小规模纳税人",//服务类型 小规模纳税人 一般纳税人
time:"40-60个工作日"//周期
}
```
#### 返回结果
``` javascript
{
"status":0,
"msg":"success",
"data":{
"productId":60,
"channelItemCode":"gszc",
"pathCode":"/gsfu/gszc/",
"province":"北京市",
"city":"北京市",
"companyType":"有限责任公司",
"serviceType":"小规模纳税人",
"payCode":"bjgszc-1",
"price":698
},
"requestId":"7c99340f7c0040b6b317b0fe9b89494a"
}
```
## **<a name="addOrder"> 创建订单</a>**
[返回到目录](#menu)
##### URL
[/web/action/product/springboard/]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
#### 渠道执行的类型 actionType：addOrder
``` javascript
{
"channelItemCode":"fzsbzc",// Y 产品的渠道编码
"payCode": "fzsbzc-1", // Y 支付价格code
"quantity":1,// Y 购买数量
"totalSum":699,// Y 订单总金额
"payTotalSum":699, // Y 订单付款总金额
"notes": "订单备注信息",// N 订单备注
"orderContact":{ // N 订单联系人信息，没有则填写{}
"contacts": "宋毅",// N 联系人
"mobile": "15010929368",// N 联系人电话
"email": "songyi@gongsibao.com"// N 联系人邮箱
},
"channelOrder":{// Y 渠道订单信息，没有则填写{}
"channelServiceNo":"",// N 服务单号（即渠道服务单号）
"channelOrderNo":"",// N 服务订单号（即渠道服务订单号，格式为： XX1,XX2）
"needNo":"",// N 需求单号（即渠道需求单号）
"payTime":"",// N 渠道需求单号支付时间
"orderStatus":1,// N 渠道需求单号支付支付状态 1: 待付款, 2: 已付款
"channelParams":""// N 渠道参数（自定义参数）
},
"deliveryData":{},//Y 交付单信息，没有则填写{}
"registerData": {//注册信息
companyName: "",
            area:"河北", // N 省
            city:"石家庄市", // N 市
            diqu:"", // N 资质办理中的地区
            companyCategory: "一般纳税人", // N 纳税人类型 一般纳税人 小规模纳税人
            companyType:"有限责任公司", //公司性质 N 有限责任公司 集团有限公司 股份有限公司 个体工商户 个体独资企业
            orgType:"加急办理", // N 加急办理或者正常办理
            "bq-time":"30-45", // N 版权中的工作日
            "zz-time":"40-60", // N 资质办理中的工作日
            industryType: "行业",// N
            scope: "经营范围",// N
            remark: "方案备注"// N
}
}
```
#### 返回结果
``` javascript
{
"status": 0,// 0为成功，否则失败
"msg": "success",
"data": {
"orderNo": "OT26202002151649kPgs",//订单号
"channelServiceNo": "OT26202002151649kPgs",//渠道服务单号
"channelOrderNo"："OT26202002151649kPgs", //渠道订单号
"channelParams": ""//渠道参数
},
"requestId": "2f90fad8108b4933bb97c3d978b0fe10"
}
```
## **<a name="submitNeedH5"> 免费咨询</a>**
[返回到目录](#menu)
##### URL
[/web/opreceive/need/springBoard]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
#### 渠道执行的类型 actionType：submitNeedH5
``` javascript
{
area: "北京市-北京市-东城区", //地区
description: "公司注册 - ", //备注
mobile: "13123456789", //手机号
type: "gszc", //产品渠道码
userName: ""//联系人
}
```
#### 返回结果
``` javascript
{
"status":0,
"msg":"success",
"data":null,
"requestId":"9d37bc51318a413491c47b443e89f50e"
}
```
\ No newline at end of file
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