Skip to content

Z
zhichan
Commit 109080c8 by linboxuan
Options

merging

parents ecb50e9c 1f233203
Showing with 96 additions and 60 deletions
center-channel/app/base/api/impl/action/fbQuery.js
...@@ -24,7 +24,7 @@ class fbQuery extends WEBBase { ...@@ -24,7 +24,7 @@ class fbQuery extends WEBBase {
case 'getDetail': // 获取详情 case 'getDetail': // 获取详情
opResult = await this.fbLSve.getDetail(pobj.actionBody.id); opResult = await this.fbLSve.getDetail(pobj.actionBody.id);
break; break;
case 'getList': case 'getList': // 获取列表
opResult = await this.fbLSve.getList(pobj.actionBody); opResult = await this.fbLSve.getList(pobj.actionBody);
break; break;
default: default:
......
center-channel/app/base/service/impl/common/centerorderSve.js
...@@ -293,6 +293,7 @@ class CenterorderService extends AppServiceBase { ...@@ -293,6 +293,7 @@ class CenterorderService extends AppServiceBase {
actionBody: { actionBody: {
orderNo: orderrtn.data.orderNo,//pobj.actionBody.channelOrder.channelOrderNo, orderNo: orderrtn.data.orderNo,//pobj.actionBody.channelOrder.channelOrderNo,
needsolution: solutiondata.data.solutionContent, needsolution: solutiondata.data.solutionContent,
channelNeedNo: solutiondata.data.channelNeedNo,
skuCode:data.data.payCode, skuCode:data.data.payCode,
servicer:{ servicer:{
code:'gsb', code:'gsb',
......
center-channel/app/base/service/impl/common/qcCenterOrderSve.js
...@@ -72,7 +72,8 @@ class QcCenterOrderService extends AppServiceBase { ...@@ -72,7 +72,8 @@ class QcCenterOrderService extends AppServiceBase {
// this.opQueuePushClientPost(pobj, this.opPushQueueUrl, reqParams); // this.opQueuePushClientPost(pobj, this.opPushQueueUrl, reqParams);
var reqParams = { var reqParams = {
actionBody: { actionBody: {
intentionBizId: needinfo.channelNeedNo intentionBizId: needinfo.channelNeedNo,
status:"createSolution"
}, },
appInfo: pobj.appInfo appInfo: pobj.appInfo
} }
......
center-channel/app/base/service/impl/utilsSve/utilsNeedSve.js
...@@ -209,6 +209,16 @@ class UtilsNeedService extends AppServiceBase { ...@@ -209,6 +209,16 @@ class UtilsNeedService extends AppServiceBase {
return system.getResultFail(-5022, "订单关闭失败"); return system.getResultFail(-5022, "订单关闭失败");
} }
} }
//推送交付系统
var reqParams = {
actionBody: {
intentionBizId: pobj.actionBody.channelNeedNo,
status:"closeNeed"
},
appInfo: pobj.appInfo
}
self.utilsPushSve.aliBusiness2Delivery(reqParams, "updateChanceStatus");
// 推送ali // 推送ali
var a = 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); console.log(a);
...@@ -284,13 +294,13 @@ class UtilsNeedService extends AppServiceBase { ...@@ -284,13 +294,13 @@ class UtilsNeedService extends AppServiceBase {
appInfo: pobj.appInfo appInfo: pobj.appInfo
} }
this.utilsPushSve.aliBusiness2Delivery(tmpObj, "pushDeliveryStatusNotify"); this.utilsPushSve.aliBusiness2Delivery(tmpObj, "pushDeliveryStatusNotify");
tmpObj.actionBody.orderNo = rtn.data.channelSolutionNo;
pobj.actionBody.orderNo = rtn.data.orderNo; pobj.actionBody.orderNo = rtn.data.orderNo;
if (actionBody.status == 11) { if (actionBody.status == 11) {
var orderrtn = await self.utilsOrderSve.delOrder(pobj, pobj.actionBody); var orderrtn = await self.utilsOrderSve.delOrder(pobj, pobj.actionBody);
if (orderrtn.status < 0) { if (orderrtn.status < 0) {
return system.getResultFail(-5022, "订单关闭失败"); return system.getResultFail(-5022, "订单关闭失败");
} }
tmpObj.actionBody.orderNo = rtn.data.channelSolutionNo;
self.utilsPushSve.aliBusiness2Fq(tmpObj, "pushOrderICPClose"); self.utilsPushSve.aliBusiness2Fq(tmpObj, "pushOrderICPClose");
} }
}//通知更新状态 }//通知更新状态
......
center-channel/app/config/settings.js
...@@ -23,6 +23,13 @@ var settings = { ...@@ -23,6 +23,13 @@ var settings = {
usertimeout: 3600,//单位秒 usertimeout: 3600,//单位秒
basepath: path.normalize(path.join(__dirname, '../..')), basepath: path.normalize(path.join(__dirname, '../..')),
port: process.env.NODE_PORT || 4012, port: process.env.NODE_PORT || 4012,
fbQueryUrl: function () {
if (this.env == 'dev' || this.env == 'test') {
return 'http://43.247.184.92:15505'
} else {
return 'http://43.247.184.92:15505'
}
},
opPushQueueUrl: function () { opPushQueueUrl: function () {
if (this.env == "dev" || this.env == "test") { if (this.env == "dev" || this.env == "test") {
return "http://192.168.18.101:4018/api/queueAction/producer/springBoard"; return "http://192.168.18.101:4018/api/queueAction/producer/springBoard";
......
center-channel/app/front/entry/public/apidoc/licensesDesc/fblicenseDesc.md
...@@ -25,26 +25,50 @@ ...@@ -25,26 +25,50 @@
``` ```
#### 返回结果 #### 返回结果
```javascript ```javascript
{ {
"code": 0, "data": [ // 结果列表
"msg": "success", {
"count": 1, "license_no": "JY11113081581363", // 许可证编号
"data": [{ "company_name": "北京金金顺平商店", // 经营者名称
"license_no": "JY11113081581363", // 许可证编号 "pub_date": "2017-12-20", // 发证时间
"company_name": "北京金金顺平商店", // 经营者名称 "end_date": "2022-12-19" // 有效期至
"pub_date": "2017-12-20", // 发证时间 }
"end_date": "2022-12-19" // 有效期至 ],
}], "msg": "查询成功",
"requestId": "62edd9eb80b04ec9b407eebf06dd1011" "page": 1,
} "pagesize": 20,
"region_count": [ // 所属地区统计
{
"doc_count": 21,
"key": "上海"
}
],
"subject_count": [ // 主体业态统计
{
"doc_count": 19,
"key": "食品销售经营者"
}
],
"year_count": [ // 发证年份统计
{
"doc_count": 2,
"key": 2019
}
],
"count": 32,
"code": 0,
"requestId": "9e6b08a448644197a87bd91577695dcb"
}
``` ```
## **<a name="getList"> 条件搜索(获取 list)</a>** ## **<a name="getList"> 条件搜索(获取 list)</a>**
[返回到目录](#menu) <a name="menu" href="/doc">返回主目录</a> [返回到目录](#menu) <a name="menu" href="/doc">返回主目录</a>
#### 经营者名称和许可证编号为模糊查询 且为必填项 #### 经营者名称和许可证编号为模糊查询 有且只有其一
##### URL ##### URL
[/web/action/fbQuery/springBoard] [/web/action/fbQuery/springBoard]
...@@ -57,9 +81,9 @@ ...@@ -57,9 +81,9 @@
```javascript ```javascript
{ {
"base": [""], // 所属地区 "base": "", // 所属地区
"pub_year": [2017], // 发证年份 "pub_year": 2017, // 发证年份
"subject_format":[""], // 主体业态 "subject_format":"", // 主体业态
"status": 1, // 状态码 0: 失效, 1: 有效 "status": 1, // 状态码 0: 失效, 1: 有效
"company_name": "", // 经营者名称 "company_name": "", // 经营者名称
"license_no": "" // 许可证编号 "license_no": "" // 许可证编号
...@@ -72,48 +96,40 @@ ...@@ -72,48 +96,40 @@
#### 返回结果 #### 返回结果
```javascript ```javascript
{
"data": [ // 结果列表
{
"license_no": "JY11113081581363", // 许可证编号
"company_name": "北京金金顺平商店", // 经营者名称
"pub_date": "2017-12-20", // 发证时间
"end_date": "2022-12-19" // 有效期至
}
],
"msg": "查询成功",
"page": 1,
"pagesize": 20,
"region_count": [ // 所属地区统计
{
"doc_count": 21,
"key": "上海"
}
],
"subject_count": [ // 主体业态统计
{ {
"msg": "success", "doc_count": 19,
"code": 0, "key": "食品销售经营者"
"count": 7, }
"data": [{ ],
"license_no": "JY11113081581363", // 许可证编号 "year_count": [ // 发证年份统计
"company_name": "北京金金顺平商店", // 经营者名称 {
"pub_date": "2017-12-20", // 发证时间 "doc_count": 2,
"end_date": "2022-12-19" // 有效期至 "key": 2019
}, { }
"license_no": "JY11112152041718", ],
"company_name": "北京东金金良商贸有限公司", "count": 32,
"pub_date": "2018-08-24", "code": 0,
"end_date": "2023-08-23" "requestId": "9e6b08a448644197a87bd91577695dcb"
}, { }
"license_no": "JY11114010394147",
"company_name": "北京市金金金鑫商店",
"pub_date": "2016-05-23",
"end_date": "2021-05-22"
}, {
"license_no": "JY11105222454885",
"company_name": "山金金王国际贸易(北京)有限公司",
"pub_date": "2019-06-21",
"end_date": "2024-06-20"
}, {
"license_no": "JY11105072127403",
"company_name": "北京金金鑫商贸店",
"pub_date": "2018-10-23",
"end_date": "2023-10-22"
}, {
"license_no": "JY11108010732650",
"company_name": "北京金金宝经贸有限公司",
"pub_date": "2016-10-21",
"end_date": "2021-10-20"
}, {
"license_no": "JY21105050529523",
"company_name": "北京市金金宝餐厅",
"pub_date": "2016-07-15",
"end_date": "2021-07-14"
}],
"requestId": "8ddc1e1ace514e238a31406e14f87e5d"
}
``` ```
## **<a name="getDetail"> 获取详情</a>** ## **<a name="getDetail"> 获取详情</a>**
...@@ -137,6 +153,7 @@ ...@@ -137,6 +153,7 @@
``` ```
#### 返回结果 #### 返回结果
```javascript ```javascript
{ {
"msg": "success", "msg": "success",
......
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