Skip to content

Z
zhichan
Commit 0a13e683 by wkliang
Options

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

parents aa5dea7e 66c7e3aa
Showing with 78 additions and 17 deletions
center-channel/app/base/api/impl/zzzd/zzzd.js
...@@ -17,6 +17,7 @@ class Zzzd extends WEBBase { ...@@ -17,6 +17,7 @@ class Zzzd extends WEBBase {
"phoneNumber": "/gsb/api/phone_number", //免费咨询 "phoneNumber": "/gsb/api/phone_number", //免费咨询
} }
this.utilsDiagnosisSve = system.getObject("service.utilsSve.utilsDiagnosisSve"); this.utilsDiagnosisSve = system.getObject("service.utilsSve.utilsDiagnosisSve");
this.centerOrderUrl = settings.centerOrderUrl();
} }
/** /**
* 接口跳转-POST请求 * 接口跳转-POST请求
...@@ -119,9 +120,15 @@ class Zzzd extends WEBBase { ...@@ -119,9 +120,15 @@ class Zzzd extends WEBBase {
return system.getResult(null, `资质列表不能为空`); return system.getResult(null, `资质列表不能为空`);
} }
try { try {
opResult = await this.restPostUrl(pobj.actionBody, settings.zzzdUrl() + this.zzzApi.recommendationBusiness); opResult =await this.restPostUrl(pobj.actionBody,settings.zzzdUrl()+this.zzzApi.recommendationBusiness);
// console.log(`根据行业获取资质 结果` + JSON.stringify(opResult)); // 调用order创建诊断单方法，并把大数据诊断结果传过去，以及客户选择的行业分类带过去 格式 【一级分类-二级分类，】
} catch (e) { pobj.actionBody.checkResult = opResult;
pobj.actionBody.diagnosisMode = "zn";
pobj.actionType = "manualEvaluation"
var reqUrl = this.centerOrderUrl + "action/diagnosis/springBoard";
let res = await this.restPostUrl(pobj,reqUrl);
console.log(res);
}catch (e) {
console.log(e); console.log(e);
return system.getResult(null, `系统错误` + JSON.stringify(e)); return system.getResult(null, `系统错误` + JSON.stringify(e));
} }
......
center-channel/app/base/service/impl/utilsSve/utilsDiagnosisSve.js
...@@ -16,7 +16,9 @@ class UtilsDiagnosisService extends AppServiceBase { ...@@ -16,7 +16,9 @@ class UtilsDiagnosisService extends AppServiceBase {
* @param {*} pobj * @param {*} pobj
* @param {*} actionBody * @param {*} actionBody
*/ */
async manualEvaluation (pobj, actionBody) { async manualEvaluation(pobj, actionBody) {
// 诊断方式rg/只能在controller层check写zn
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;
...@@ -32,7 +34,7 @@ class UtilsDiagnosisService extends AppServiceBase { ...@@ -32,7 +34,7 @@ class UtilsDiagnosisService extends AppServiceBase {
return diagnosisInfoResult; return diagnosisInfoResult;
} }
/** /**
* 2020 0811 lin 个人中心企业信息111 * 2020 0811 lin 个人中心企业信息
* @param {*} pobj * @param {*} pobj
* @param {*} actionBody * @param {*} actionBody
*/ */
......
center-channel/app/config/routes/api.js
...@@ -211,7 +211,8 @@ module.exports = function (app) { ...@@ -211,7 +211,8 @@ module.exports = function (app) {
res.end(JSON.stringify(result)); res.end(JSON.stringify(result));
return; return;
} }
if (["getAppTokenByHosts", "getAppTokenByAppKey", "test","getIndustries","getSecondIndustries","getQualificationByIndustry","check","counselling"].indexOf(req.body.actionType) >= 0) { // 2020 0812 lin 只去掉了check，因为要记录智能诊断的返回值，其他接口暂时未去掉
if (["getAppTokenByHosts", "getAppTokenByAppKey", "test","getIndustries","getSecondIndustries","getQualificationByIndustry","counselling"].indexOf(req.body.actionType) >= 0) {
req.body.actionBody.appHosts = req.host; req.body.actionBody.appHosts = req.host;
next(); next();
return; return;
...@@ -244,7 +245,8 @@ module.exports = function (app) { ...@@ -244,7 +245,8 @@ 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",
"manualEvaluation", 'getNeedListUser' "getNeedListUser",
"manualEvaluation", "diagnosisInfo", "check", "enterpriseInfo"
]; ];
if (lst.indexOf(req.body.actionType) >= 0) { if (lst.indexOf(req.body.actionType) >= 0) {
var userpin = req.headers["userpin"] || ""; var userpin = req.headers["userpin"] || "";
......
center-channel/app/front/entry/public/apidoc/platform/zzzd.md
...@@ -50,6 +50,9 @@ ...@@ -50,6 +50,9 @@
{ {
"enterprise": "企业名称", "enterprise": "企业名称",
"mobile": "联系电话", "mobile": "联系电话",
"corporateType": "店铺类型 电商诊断：qi旗舰店qjd/专卖店zmd/直营店zyd，直播诊断：企业qy/个体工商户gtgsh/民办非企业mbfqy/法律服务flfw",
"diagnosisType": "诊断类型 直播/电商 zb/ds",
"mainClass": ["一级-二级","一级-二级"]"主营类目",
基础资质 如果非必填的资质未上传，则picUrl给""即可 基础资质 如果非必填的资质未上传，则picUrl给""即可
"qualificationsPic":[{ "qualificationsPic":[{
"picName": "营业执照", "picName": "营业执照",
...@@ -67,7 +70,7 @@ ...@@ -67,7 +70,7 @@
"picUrl": "https://gsb-zc.oss-cn-beijing.aliyuncs.com//zc_958415948076283422020615.jpg" "picUrl": "https://gsb-zc.oss-cn-beijing.aliyuncs.com//zc_958415948076283422020615.jpg"
}], }],
行业资质 行业资质
"brandPic":[{ "industryPic":[{
"picName": "营业执照", "picName": "营业执照",
"picUrl": "https://gsb-zc.oss-cn-beijing.aliyuncs.com//zc_958415948076283422020615.jpg" "picUrl": "https://gsb-zc.oss-cn-beijing.aliyuncs.com//zc_958415948076283422020615.jpg"
},{ },{
...@@ -80,11 +83,10 @@ ...@@ -80,11 +83,10 @@
#### 返回结果 #### 返回结果
``` javascript ``` javascript
{ {
"status": -1, "status": -5005,
"msg": "审核不通过，原因:营业执照分析失败", "msg": "诊断类型不能为空",
"data": null, "data": null,
"bizmsg": "empty", "requestId": "4a19931c4f9e4d2c8c0a203407de46f5"
"requestId": "7ac5b432225d43c58e78dcc630518fdd"
} }
{ {
"status": 0, "status": 0,
...@@ -121,8 +123,30 @@ ...@@ -121,8 +123,30 @@
{ {
"status": 0, "status": 0,
"msg": "success", "msg": "success",
"data": null, "data": {
"requestId": "837ea5c284074d568fa198f7f259088a" "count": 11,
"rows": [
{
"diagnosis_no": "N202008121159HM3GJ89",
"corporate_name": "1",
"publish_mobile": "14444444444",
"diagnosis_type_name": "直播",
"diagnosis_mode_name": "智能评估",
"diagnosis_result_name": "未通过",
"updated_at": "2020-08-12T03:59:35.000Z"
},
{
"diagnosis_no": "N202008121159HM3GJ89",
"corporate_name": "1",
"publish_mobile": "14444444444",
"diagnosis_type_name": "直播",
"diagnosis_mode_name": "智能评估",
"diagnosis_result_name": "未通过",
"updated_at": "2020-08-12T03:59:35.000Z"
},
]
},
"requestId": "6934d3c04d744bfa900c9c929b08dd7b"
} }
``` ```
...@@ -139,12 +163,38 @@ ...@@ -139,12 +163,38 @@
#### 返回结果 #### 返回结果
``` javascript ``` javascript
// 等待填写
{ {
"status": 0, "status": 0,
"msg": "success", "msg": "success",
"data": null, "data": {
"requestId": "837ea5c284074d568fa198f7f259088a" "id": 10,
"uapp_id": 22,
"channel_user_id": "13911391996",
"diagnosis_no": "N2020081211076qlz86H",
"corporate_name": "林氏集团",
"publish_name": null,
"publish_mobile": "13911391996",
"corporate_type": "qjd",
"corporate_type_name": "旗舰店",
"diagnosis_type": "zb",
"diagnosis_type_name": "直播",
"diagnosis_mode": "rg",
"diagnosis_mode_name": "人工评估",
"diagnosis_result": "wtg",
"diagnosis_result_name": "未通过",
"diagnosis_result_data": null,
"status_name": "已完成",
"qualifications_pic": null,
"brand_pic": null,
"industry_pic": null,
"notes": null,
"status": "ywc",
"created_at": "2020-08-12T03:07:27.000Z",
"updated_at": "2020-08-12T05:56:09.000Z",
"deleted_at": null,
"version": 0
},
"requestId": "2208af94126f4c168659947dc8bd4feb"
} }
``` ```
......
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