Skip to content

Z
zhichan
Commit 03392123 by 宋毅
Options

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

parents d8c14a45 7b24491f
Showing with 217 additions and 11 deletions
center-channel/app/base/api/impl/opreceive/need.js
...@@ -73,6 +73,9 @@ class Need extends APIBase { ...@@ -73,6 +73,9 @@ class Need extends APIBase {
case "queryExpertApplyCommunicationLogs"://icp接收方案反馈信息 case "queryExpertApplyCommunicationLogs"://icp接收方案反馈信息
opResult = await this.utilsNeedSve.queryExpertApplyCommunicationLogs(pobj); opResult = await this.utilsNeedSve.queryExpertApplyCommunicationLogs(pobj);
break; break;
case "getaliicpProduce"://方案询价
opResult = await this.centerorderSve.getaliicpProduce(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/centerorderSve.js
...@@ -214,6 +214,27 @@ class CenterorderService extends AppServiceBase { ...@@ -214,6 +214,27 @@ class CenterorderService extends AppServiceBase {
// return system.getResultSuccess(data); // return system.getResultSuccess(data);
} }
async getaliicpProduce(pobj){
var sobj = {
actionType: "getaliicpProduce",
// actionBody: { typeCode: itemResult.data.channelTypeCode, province: itemResult.data.province },
actionBody: { typeCode: pobj.actionBody.channelTypeCode, province: pobj.actionBody.province },
appInfo: pobj.appInfo,
actionProcess: pobj.actionProcess
}
var url = settings.centerAppUrl() + "action/opProduct/springBoard";
var rtn = await this.execClient.execPost(sobj, url);
if (!rtn || !rtn.stdout) {
return system.getResultFail(-5010, "产品查询失败");
}
var data = JSON.parse(rtn.stdout);
if (data.status != 0) {
return system.getResultFail(-5010, "产品查询失败");
}
return system.getResultSuccess(data.data);
}
async icppaysuccess(pobj) { async icppaysuccess(pobj) {
var sobj = { var sobj = {
actionType: "getaliicpProduce", actionType: "getaliicpProduce",
......
center-channel/app/base/service/impl/utilsSve/utilsDiagnosisSve.js
...@@ -6,7 +6,7 @@ const { json } = require("sequelize"); ...@@ -6,7 +6,7 @@ const { json } = require("sequelize");
// 2020 0807 lin 新增 诊断宝相关 // 2020 0807 lin 新增 诊断宝相关
// 接口文档地址： // 接口文档地址：
class UtilsDiagnosisService extends AppServiceBase { class UtilsDiagnosisService extends AppServiceBase {
constructor() { constructor () {
super(); super();
this.centerOrderUrl = settings.centerOrderUrl(); this.centerOrderUrl = settings.centerOrderUrl();
} }
...@@ -20,7 +20,7 @@ class UtilsDiagnosisService extends AppServiceBase { ...@@ -20,7 +20,7 @@ class UtilsDiagnosisService extends AppServiceBase {
// 诊断方式rg/只能在controller层check写zn // 诊断方式rg/只能在controller层check写zn
actionBody.diagnosisMode = "rg" actionBody.diagnosisMode = "rg"
var reqUrl = this.centerOrderUrl + "action/diagnosis/springBoard"; var reqUrl = this.centerOrderUrl + "action/diagnosis/springBoard";
var manualEvaluationResult =await this.restPostUrl(pobj,reqUrl); var manualEvaluationResult = await this.restPostUrl(pobj, reqUrl);
return manualEvaluationResult; return manualEvaluationResult;
} }
/** /**
...@@ -28,9 +28,9 @@ class UtilsDiagnosisService extends AppServiceBase { ...@@ -28,9 +28,9 @@ class UtilsDiagnosisService extends AppServiceBase {
* @param {*} pobj * @param {*} pobj
* @param {*} actionBody * @param {*} actionBody
*/ */
async diagnosisInfo(pobj, actionBody) { async diagnosisInfo (pobj, actionBody) {
var reqUrl = this.centerOrderUrl + "action/diagnosis/springBoard"; var reqUrl = this.centerOrderUrl + "action/diagnosis/springBoard";
var diagnosisInfoResult =await this.restPostUrl(pobj,reqUrl); var diagnosisInfoResult = await this.restPostUrl(pobj, reqUrl);
return diagnosisInfoResult; return diagnosisInfoResult;
} }
/** /**
...@@ -38,9 +38,9 @@ class UtilsDiagnosisService extends AppServiceBase { ...@@ -38,9 +38,9 @@ class UtilsDiagnosisService extends AppServiceBase {
* @param {*} pobj * @param {*} pobj
* @param {*} actionBody * @param {*} actionBody
*/ */
async enterpriseInfo(pobj, actionBody) { async enterpriseInfo (pobj, actionBody) {
var reqUrl = this.centerOrderUrl + "action/diagnosis/springBoard"; var reqUrl = this.centerOrderUrl + "action/diagnosis/springBoard";
var enterpriseInfoResult =await this.restPostUrl(pobj,reqUrl); var enterpriseInfoResult = await this.restPostUrl(pobj, reqUrl);
return enterpriseInfoResult; return enterpriseInfoResult;
} }
/** /**
...@@ -48,9 +48,9 @@ class UtilsDiagnosisService extends AppServiceBase { ...@@ -48,9 +48,9 @@ class UtilsDiagnosisService extends AppServiceBase {
* @param {*} pobj * @param {*} pobj
* @param {*} actionBody * @param {*} actionBody
*/ */
async needInfo(pobj, actionBody) { async needInfo (pobj, actionBody) {
var reqUrl = this.centerOrderUrl + "action/diagnosis/springBoard"; var reqUrl = this.centerOrderUrl + "action/diagnosis/springBoard";
var enterpriseInfoResult =await this.restPostUrl(pobj,reqUrl); var enterpriseInfoResult = await this.restPostUrl(pobj, reqUrl);
return enterpriseInfoResult; return enterpriseInfoResult;
} }
/** /**
...@@ -58,9 +58,31 @@ class UtilsDiagnosisService extends AppServiceBase { ...@@ -58,9 +58,31 @@ class UtilsDiagnosisService extends AppServiceBase {
* @param {*} pobj * @param {*} pobj
* @param {*} actionBody * @param {*} actionBody
*/ */
async needDetail(pobj, actionBody) { async needDetail (pobj, actionBody) {
var reqUrl = this.centerOrderUrl + "action/diagnosis/springBoard"; var reqUrl = this.centerOrderUrl + "action/diagnosis/springBoard";
var enterpriseInfoResult =await this.restPostUrl(pobj,reqUrl); var enterpriseInfoResult = await this.restPostUrl(pobj, reqUrl);
return enterpriseInfoResult;
}
/**
* @description
* @author liangwk
* @param {*} pobj
* @param {*} actionBody
* @param {*} req
* @returns
* @memberof UtilsDiagnosisService
*/
async opNeedList (pobj) {
var reqUrl = this.centerOrderUrl + "action/diagnosis/springBoard";
var enterpriseInfoResult = await this.restPostUrl(pobj, reqUrl);
return enterpriseInfoResult;
}
async getItemByNeedNo (pobj) {
var reqUrl = this.centerOrderUrl + "action/diagnosis/springBoard";
var enterpriseInfoResult = await this.restPostUrl(pobj, reqUrl);
return enterpriseInfoResult; return enterpriseInfoResult;
} }
} }
......
center-channel/app/config/routes/api.js
...@@ -245,6 +245,7 @@ module.exports = function (app) { ...@@ -245,6 +245,7 @@ module.exports = function (app) {
"submitProgramme", "getProgrammeListByUser", "getProgrammeInfoByNeedNo", "abolishProgramme", "getAliPayInfo", "submitProgramme", "getProgrammeListByUser", "getProgrammeInfoByNeedNo", "abolishProgramme", "getAliPayInfo",
"getPaidLogoListByUser","getCollectibleLogoListByUser","collectLogo","getLogoMaterial","cancelCollectLogo","icpNotify","createName","getNameDetail","orderConfirm", "getPaidLogoListByUser","getCollectibleLogoListByUser","collectLogo","getLogoMaterial","cancelCollectLogo","icpNotify","createName","getNameDetail","orderConfirm",
"orderTotalSum", "collect", "reg", "orderCheck","getReOrderList","getOfficalList","addReviewList","opSubmitNeed","opNeedClose","opNeedList","opNeedDetailByChannelNo", "orderTotalSum", "collect", "reg", "orderCheck","getReOrderList","getOfficalList","addReviewList","opSubmitNeed","opNeedClose","opNeedList","opNeedDetailByChannelNo",
"getNeedListUser",
"manualEvaluation", "diagnosisInfo", "check", "enterpriseInfo" "manualEvaluation", "diagnosisInfo", "check", "enterpriseInfo"
]; ];
if (lst.indexOf(req.body.actionType) >= 0) { if (lst.indexOf(req.body.actionType) >= 0) {
......
center-channel/app/front/entry/public/apidoc/platform/icpOrder.md
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
1. [交付商提交材料信息](#serviceProviderSubmitMaterial) 1. [交付商提交材料信息](#serviceProviderSubmitMaterial)
1. [交付商通知状态变更](#serviceProviderNotification) 1. [交付商通知状态变更](#serviceProviderNotification)
1. [交付商关闭交付单](#closeOrderDelivery) 1. [交付商关闭交付单](#closeOrderDelivery)
1. [方案询价](#getaliicpProduce)
## **<a name="submitIcpProgramme"> icp方案提交</a>** ## **<a name="submitIcpProgramme"> icp方案提交</a>**
[返回到目录](#menu) [返回到目录](#menu)
...@@ -722,3 +723,37 @@ status： ...@@ -722,3 +723,37 @@ status：
"requestId":"40769e74e83f4505a78b24d84fed870b" "requestId":"40769e74e83f4505a78b24d84fed870b"
} }
``` ```
## **<a name="getaliicpProduce"> 方案询价</a>**
[返回到目录](#menu)
##### URL
[/web/opreceive/need/springBoard]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
#### 渠道执行的类型 actionType：getaliicpProduce
``` javascript
{
"actionType":"getaliicpProduce",
"actionBody":{
"channelTypeCode": "5",
"province":"北京"
}
}
```
#### 返回结果
```javascript
{
"status": 0,
"msg": "success",
"data": {
"typeCode": "5",
"province": "北京",
"payCode": "bjicpsq-1",
"channelItemCode": "5",
"price": 1
},
"requestId": "5d4b3beb820541c4a4533b3363fba34b"
}
```
center-channel/app/front/entry/public/apidoc/platform/opNeed.md
...@@ -189,7 +189,7 @@ ...@@ -189,7 +189,7 @@
} }
``` ```
## **<a name="opNeedList"> 需求详情</a>** ## **<a name="getItemByNeedNo"> 需求详情</a>**
[返回到目录](#menu) [返回到目录](#menu)
##### URL ##### URL
[/web/action/opNeed/springBoard] [/web/action/opNeed/springBoard]
...@@ -211,6 +211,7 @@ ...@@ -211,6 +211,7 @@
``` ```
#### 返回结果 #### 返回结果
``` javascript ``` javascript
// 返回字段需要根据原型来做，目前只返回基础数据 // 返回字段需要根据原型来做，目前只返回基础数据
......
center-channel/app/front/entry/public/apidoc/platform/zzzd.md
...@@ -3,6 +3,8 @@ ...@@ -3,6 +3,8 @@
2. [人工评估-开始入职评估](#manualEvaluation) 2. [人工评估-开始入职评估](#manualEvaluation)
3. [个人中心-诊断列表](#diagnosisInfo) 3. [个人中心-诊断列表](#diagnosisInfo)
4. [个人中心-企业信息](#enterpriseInfo) 4. [个人中心-企业信息](#enterpriseInfo)
5. [需求列表](#getNeedListUser)
6. [需求详情](#getNeedDetail)
## **<a name="uploadBusiness"> 四要素诊断</a>** ## **<a name="uploadBusiness"> 四要素诊断</a>**
[返回到目录](#menu) [返回到目录](#menu)
...@@ -194,4 +196,124 @@ ...@@ -194,4 +196,124 @@
}, },
"requestId": "2208af94126f4c168659947dc8bd4feb" "requestId": "2208af94126f4c168659947dc8bd4feb"
} }
```
## **<a name="getNeedListUser"> 需求列表</a>**
[返回到目录](#menu)
##### URL
[/web/zzzd/zzzd/springBoard]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
#### 渠道执行的类型 actionType：enterpriseInfo
``` javascript
{
"status": "状态", // 目前枚举和原型不同 不建议筛选
"needNo": "", // 需求单号
"publishName": "", // 联系人姓名
"publishMobile": "", // 联系人电话
"updatedAt": [], // 更新时间 两个日期
"pageNo": 1, // 页数
"pageSize": 10 // 每页条数
}
```
#### 返回结果
``` javascript
// 等待填写
{
"status": 0,
"msg": "success",
"data": {
"count": 13,
"rows": [
{
"id": 2844,
"uapp_id": 22,
"channelNeedNo": "N202008111821nf9oKFf", // 渠道需求号
"needNo": "N202008111821nf9oKFf", // 需求号
"channelUserId": "13911391996", // 渠道用户id
"publishName": "", // 公司名称
"publisherOnlyCode": null,
"publishContent": "公司注册 - ",
"publishMobile": "13911391996", // 联系人电话
"followManUserId": null,
"followManName": null,
"followManMobile": null,
"followManOnlyCode": null,
"followContent": null,
"productOneType_id": null,
"productType_id": null,
"notes": null,
"disposeNotes": null,
"statusName": "未推送", // 需求状态
"status": "wts",
"city": "北京市-北京市-大兴区",
"province": null,
"typeCode": "gszc", // 需求类型
"typeName": "公司注册", // 需求类型名称
"channelTypeCode": "gszc",
"channelTypeName": "公司注册",
"created_at": "2020-08-11T10:21:38.000Z",
"updated_at": "2020-08-11T10:21:38.000Z",
"deleted_at": null,
"version": 0
},
]
},
"requestId": "b2146c22a68b4bd48dc2119b46e636d4"
}
```
## **<a name="getNeedDetail"> 需求详情</a>**
[返回到目录](#menu)
##### URL
[/web/zzzd/zzzd/springBoard]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
#### 渠道执行的类型 actionType：enterpriseInfo
``` javascript
{
"needNo": "", // 需求单号
}
```
#### 返回结果
``` javascript
{
"status": 0,
"msg": "success",
"data": {
"id": 2844,
"uapp_id": 22,
"channelNeedNo": "N202008111821nf9oKFf", // 渠道需求号
"needNo": "N202008111821nf9oKFf", // 需求号
"channelUserId": "13911391996", // 渠道用户id
"publishName": "", // 公司名称
"publisherOnlyCode": null,
"publishContent": "公司注册 - ",
"publishMobile": "13911391996", // 联系人电话
"followManUserId": null,
"followManName": null,
"followManMobile": null,
"followManOnlyCode": null,
"followContent": null,
"productOneType_id": null,
"productType_id": null,
"notes": null,
"disposeNotes": null,
"statusName": "未推送", // 需求状态
"status": "wts",
"city": "北京市-北京市-大兴区",
"province": null,
"typeCode": "gszc", // 需求类型
"typeName": "公司注册", // 需求类型名称
"channelTypeCode": "gszc",
"channelTypeName": "公司注册",
"created_at": "2020-08-11T10:21:38.000Z",
"updated_at": "2020-08-11T10:21:38.000Z",
"deleted_at": null,
"version": 0
},
"requestId": "9032ccf593894627849eb401ebf4f51b"
}
``` ```
\ 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