Skip to content

Z
zhichan
Commit 2c86ef91 by 孙亚楠
Options

添加交付商文档

parent 53530b7c
Showing with 183 additions and 53 deletions
xgg-deliver/app/base/controller/impl/business/businessmenCtl.js
...@@ -21,7 +21,6 @@ class BusinessmenCtl extends CtlBase { ...@@ -21,7 +21,6 @@ class BusinessmenCtl extends CtlBase {
orderId: this.trim(pobj.orderId), orderId: this.trim(pobj.orderId),
bstatus: pobj.status, bstatus: pobj.status,
} }
return await this.businessmenSve.allPage(condition); return await this.businessmenSve.allPage(condition);
} catch (error) { } catch (error) {
console.log(error); console.log(error);
......
xgg-deliver/app/base/controller/impl/invoice/invoiceCtl.js
...@@ -264,5 +264,20 @@ class InvoiceCtl extends CtlBase { ...@@ -264,5 +264,20 @@ class InvoiceCtl extends CtlBase {
return system.getResultFail(500, `接口错误 错误信息 ${error}`); return system.getResultFail(500, `接口错误 错误信息 ${error}`);
} }
} }
/**
* 发票红冲列表
* @param {*} pobj
* @param {*} pobj2
* @param {*} req
* @param {*} res
*/
async redRushList(pobj,pobj2,req,res){
try {
return await this.invoiceSve.apiRedrushList(pobj);
} catch (error) {
return system.getResultFail(500, `接口错误 错误信息 ${error}`);
}
}
} }
module.exports = InvoiceCtl; module.exports = InvoiceCtl;
\ No newline at end of file
xgg-deliver/app/base/controller/impl/order/orderCtl.js
...@@ -125,7 +125,7 @@ class OrderCtl extends CtlBase { ...@@ -125,7 +125,7 @@ class OrderCtl extends CtlBase {
id: pobj.id, id: pobj.id,
currentPage: pobj.currentPage || 1, currentPage: pobj.currentPage || 1,
pageSize: pobj.pageSize || 1, pageSize: pobj.pageSize || 1,
orderId: this.trim(pobj.orderId), orderId: this.trim(pobj.orderId) || this.trim(pobj.orderNo),
status: this.trim(pobj.status), status: this.trim(pobj.status),
deliverId: "", // TODO 传入具体办理人 deliverId: "", // TODO 传入具体办理人
} }
......
xgg-deliver/app/base/service/impl/invoice/invoiceSve.js
...@@ -859,6 +859,14 @@ class InvoiceService extends ServiceBase { ...@@ -859,6 +859,14 @@ class InvoiceService extends ServiceBase {
} }
} }
async apiRedrushList(params){
try {
return await this.callms("invoice", "redrushList", params);
} catch (error) {
return system.getResult(-1, `系统错误 错误信息 ${error}`);
}
}
} }
module.exports = InvoiceService; module.exports = InvoiceService;
\ No newline at end of file
xgg-deliver/app/base/system.js
...@@ -189,8 +189,8 @@ class System { ...@@ -189,8 +189,8 @@ class System {
invoice: "http://127.0.0.1:3105" + path, invoice: "http://127.0.0.1:3105" + path,
// 发票服务 // 发票服务
// uc: domain + ":3106" + path, uc: domain + ":3106" + path,
uc: "http://127.0.0.1:3106" + path, // uc: "http://127.0.0.1:3106" + path,
} }
} else { } else {
var odomain = "http://123.57.217.203" var odomain = "http://123.57.217.203"
......
xgg-deliver/app/config/routes/web.js
...@@ -104,6 +104,7 @@ module.exports = function (app) { ...@@ -104,6 +104,7 @@ module.exports = function (app) {
if(req.loginUser) { if(req.loginUser) {
req.body.saas_id = req.loginUser.saas_id; req.body.saas_id = req.loginUser.saas_id;
req.body.deliverId = req.loginUser.uctypeId || ""; req.body.deliverId = req.loginUser.uctypeId || "";
req.body.delivererId = req.loginUser.uctypeId || "";
} }
params.push(methodName); params.push(methodName);
......
xgg-deliver/app/front/entry/public/apidoc/README.md
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
　　2 [全部发票](/doc/invoice/all.md) 　　2 [全部发票](/doc/invoice/all.md)
　　3 [发票办理](/doc/invoice/deliver.md) 　　3 [交付商发票接口](/doc/invoice/deliver.md)
　　4 [发票管理](/doc/invoice/info.md) 　　4 [发票管理](/doc/invoice/info.md)
......
xgg-deliver/app/front/entry/public/apidoc/invoice/deliver.md
<a name="menu">目录</a> <a name="menu">目录</a>
1. [交付查看商审批列表](#delivererInvoices) 1. [交付商查看发票列表](#delivererInvoices)
1. [交付商查看发票审批列表](#delivererApplyInvoices)
1. [红冲列表](#redRushList)
1. [新建进度-已开具](#delivererAssignment) 1. [新建进度-已开具](#delivererAssignment)
1. [提交审核](#delivererAssignment2) 1. [提交审核](#delivererAssignment2)
1. [新建进度-已邮寄](#delivererAssignment3) 1. [新建进度-已邮寄](#delivererAssignment3)
1. [查看详情-和平台不一样](#queryInvoiceDeliverer) 1. [查看详情](#queryInvoiceDeliverer)
...@@ -21,21 +23,91 @@ ...@@ -21,21 +23,91 @@
| pageIndex | number | 否 | 1　| 当前页数 | | pageIndex | number | 否 | 1　| 当前页数 |
| pageSize | number | 否 | 10　| 每页记录数 | | pageSize | number | 否 | 10　| 每页记录数 |
| complateTax | string | 否 | 　| 是否完税 |
| invoiceTime | string | 否 | 　| 开发票时间 | | invoiceTime | string | 否 | 　| 开发票时间 |
| startTime | string | 否 | 　| 开发票开始时间 |
| endTime | string | 否 | 　| 开发票结束时间 |
| applyNo | string | 否 | 　| 发票申请编号 | | applyNo | string | 否 | 　| 发票申请编号 |
| inInvalid | string | 否 | 　| 是否完税 | | invoiceNo | string | 否 | 　| 发票编号 |
| type | string | 否 | 　| 发票类型 | | type | string | 否 | 　 | 发票类型 |
| status | string | 否 | 　| 发票状态 |
**示例**
``` **返回结果**
| 参数名|数据类型| 说明 |
|---|:---:|---|
| status | Number | 状态码 |
| msg | String | 提示信息 |
| data | JSON | 返回值 |
**示例**
```javascript
{ {
"type":"10" "status": 0,
"msg": "操作成功",
"data": {
"count": 1,
"rows": [
{
"id": "11667778231000774",
"apply_no": "gongsibao002", //申请编号
"type": "普通发票", //发票状态
"invoice_no": "gongsibao002", //发票编号
"invoice_time": "2019-11-27 00:00:00", //发票时间
"invoice_amount": 20000000, //发票金额
"merchant_id": "18asf854584", //购买方ID
"merchant_name": "汉唐信通（咨询）有限公司", //购买方名称
"merchant_credit_code": "911101057889696760", //购买方统一社会信用代码
"merchant_addr": "北京市朝阳区来广营西路8号国创产业园6号楼三层东壹区", //购买方地址
"merchant_mobile": "010-8492", //购买方电话
"merchant_bank": "招商银大望路支行", //购买方银行
"merchant_account": "tengxunkeji", //购买方账号
"businessmen_id": "101", //销售方ID
"businessmen_credit_code": "91110108MA01H5F77N", //销售方统一社会信用代码
"businessmen_name": "滴滴出行", //销售方名称
"businessmen_addr": "北京市海淀区西北旺东路10号院东区2号楼二层202", //销售方地址
"businessmen_mobile": "010-5236", //销售方电话
"businessmen_bank": "北京朝阳双秀支", //销售方电话
"businessmen_account": "8569659856", //销售方账号
"is_bank": 1, //是否开户
"tax_authoritioes": "北京市工商行政管理局海淀分局", //授权机构
"is_invalid": "2", //是否红冲（已放弃）
"complate_tax": "未完成", //是否完税
"status": "1080", //发票状态
"red_status": "未红冲", //是否红冲
"month": 11, //月份
"statusName": "已邮寄" //发票状态
}
]
},
"bizmsg": "empty",
"requestid": "93df11627c4a46628e801cb52c48bf85"
} }
``` ```
## **<a name="delivererApplyInvoices"> 发票申请列表（交付商） </a>**　　　　　
[返回到目录](#menu)　　　　　
**接口方式** HTTP
**HTTP方法** POST
**URI路径** /web/invoice/invoiceCtl/delivererApplyInvoices
**参数验证** 否
**参数**
| 参数名|数据类型|必须|默认| 说明 |
|---|:---:|:---:|:---:|---|
| pageIndex | number | 否 | 1　| 当前页数 |
| pageSize | number | 否 | 10　| 每页记录数 |
| invoiceTime | string | 否 | 　| 开发票时间 |
| startTime | string | 否 | 　| 开发票开始时间 |
| endTime | string | 否 | 　| 开发票结束时间 |
| applyNo | string | 否 | 　| 发票申请编号 |
| inInvalid | string | 否 | 　| 是否完税 |
| type | string | 否 | 　 | 发票类型 |
| status | string | 否 | 　| 发票状态 |
**返回结果** **返回结果**
| 参数名|数据类型| 说明 | | 参数名|数据类型| 说明 |
...@@ -45,58 +117,91 @@ ...@@ -45,58 +117,91 @@
| data | JSON | 返回值 | | data | JSON | 返回值 |
**示例** **示例**
```javascript ```javascript
{ {
"status":0, "status": 0,
"msg":"操作成功", "msg": "操作成功",
"data":{ "data": {
"count":2, "count": 1,
"rows":[ "rows": [
{ {
"applyNo":"gongsibao-futong001", "id": "11667778231000774",
"invoiceId":"11665448190004592", "apply_no": "gongsibao002", //申请编号
"breakReason":null, "type": "普通发票", //发票类型
"apply":{ "invoice_amount": 20000000, //发票金额
"merchantId":"11064622752480055", "invoice_time": "2019-09-19 00:00:00", //发票时间
"merchantName":"司机宝", "status": "1080", //发票状态
"type":"增值税专用发票", "merchant_name": "汉唐信通（咨询）有限公司", //购买方名称
"invoiceAmount":400000000, "businessmen_name": "滴滴出行", //销售方名称
"invoiceTime":"2019-10-19", "statusName": "已邮寄" //状态名称
"businessName":"北京富通勤国际贸易有限责任公司（个体工商）"
},
"invoice":{
"invoiceNo":"gongsibao4584585",
"status":"1060",
"statusName":"待审核"
} }
]
}, },
"bizmsg": "empty",
"requestid": "3dc2b7a6d1f849d2bd1066ef180c5272"
}
```
## **<a name="redRushList"> 红冲列表） </a>**　　　　　
[返回到目录](#menu)　　　　　
**接口方式** HTTP
**HTTP方法** POST
**URI路径** /web/invoice/invoiceCtl/redRushList
**参数验证** 否
**参数**
| 参数名|数据类型|必须|默认| 说明 |
|---|:---:|:---:|:---:|---|
| pageIndex | number | 否 | 1　| 当前页数 |
| pageSize | number | 否 | 10　| 每页记录数 |
| invoiceTime | string | 否 | 　| 开发票时间 |
| startTime | string | 否 | 　| 开发票开始时间 |
| endTime | string | 否 | 　| 开发票结束时间 |
| applyNo | string | 否 | 　| 发票申请编号 |
| inInvalid | string | 否 | 　| 是否完税 |
| type | string | 否 | 　 | 发票类型 |
| status | string | 否 | 　| 发票状态 "1030": "待处理", "1040": "交付商关闭", "1050": "已开具", "1060": "待审核", "1080": "已邮寄", "1300": "审核失败(平台第二次审核)"|
| redStatus | string | 否 | 　| 红冲状态 1：未红冲 2：红冲中 3 红冲失败 4 红冲成功 |
**返回结果**
| 参数名|数据类型| 说明 |
|---|:---:|---|
| status | Number | 状态码 |
| msg | String | 提示信息 |
| data | JSON | 返回值 |
**示例**
```javascript
{
"status": 0,
"msg": "操作成功",
"data": {
"count": 1,
"rows": [
{ {
"applyNo":"gongsibao-futong001", "id": "11667778231000774",
"invoiceId":"11665448190004592", "apply_no": "gongsibao002", //申请编号
"breakReason":"业务繁忙", "type": "普通发票", //发票类型
"apply":{ "invoice_amount": 20000000, //发票金额
"merchantId":"11064622752480055", "invoice_time": "2019-09-19 00:00:00", //发票时间
"merchantName":"司机宝", "status": "1080", //发票状态
"type":"增值税专用发票", "merchant_name": "汉唐信通（咨询）有限公司", //购买方名称
"invoiceAmount":400000000, "businessmen_name": "滴滴出行", //销售方名称
"invoiceTime":"2019-10-19", "statusName": "已邮寄" //状态名称
"businessName":"北京富通勤国际贸易有限责任公司（个体工商）"
},
"invoice":{
"invoiceNo":"gongsibao4584585",
"status":"1060",
"statusName":"待审核"
}
} }
] ]
}, },
"bizmsg":"empty", "bizmsg": "empty",
"requestid":"21da505b34d7423fbbb8865d64f652a5" "requestid": "3dc2b7a6d1f849d2bd1066ef180c5272"
} }
``` ```
## **<a name="delivererAssignment"> 新建进度-已开具</a>**　　　　　 ## **<a name="delivererAssignment"> 新建进度-已开具</a>**　　　　　
[返回到目录](#menu)　　　　　 [返回到目录](#menu)　　　　　
...@@ -233,7 +338,7 @@ ...@@ -233,7 +338,7 @@
``` ```
## **<a name="queryInvoiceDeliverer"> 查看详情-和平台不一样</a>**　　　　　 ## **<a name="queryInvoiceDeliverer"> 查看详情</a>**　　　　　
[返回到目录](#menu)　　　　　 [返回到目录](#menu)　　　　　
**接口方式** HTTP **接口方式** HTTP
......
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