Skip to content

Z
zhichan
Commit 885ad66d by 宋毅
Options

tj

parent 5ccbe000
Showing with 217 additions and 10 deletions
center-channel/app/base/api/impl/opaction/order.js
......@@ -36,6 +36,9 @@ class ProductAPI extends APIBase {
case "getOrderDeliveryInfo"://获取订单交付信息
opResult = await this.utilsOrderSve.getOrderDeliveryInfo(pobj, pobj.actionBody);
break;
case "getOrderDeliveryFlowInfo"://获取订单交付流程信息
opResult = await this.utilsOrderSve.getOrderDeliveryFlowInfo(pobj, pobj.actionBody);
break;
// case "getIcbcOrderDetails"://获取工商详情
// opResult = await this.utilsOrderSve.addOrder(pobj, pobj.actionBody);
// break;
......
center-channel/app/base/service/impl/utilsSve/utilsOrderSve.js
......@@ -90,6 +90,14 @@ class UtilsOrderService extends AppServiceBase {
var result = await this.restPostUrl(pobj, reqUrl);
return result;
}
async getOrderDeliveryFlowInfo(pobj, actionBody) {
if (!actionBody.sourceOrderNo) {
return system.getResult(null, "actionBody.sourceOrderNo can not be empty");
}
var reqUrl = this.centerOrderUrl + "action/order/springBoard";
var result = await this.restPostUrl(pobj, reqUrl);
return result;
}
async icOrderStatusNotify(pobj, actionBody) {
if (!actionBody.orderNo) {
return system.getResult(null, "actionBody.orderNo can not be empty");
......
center-channel/app/config/routes/api.js
......@@ -37,6 +37,7 @@ module.exports = function (app) {
var token = req.headers["token"] || "";
if (!token) {
result.msg = "req headers token can not be empty";
result.data = null;
res.end(JSON.stringify(result));
return;
}
......@@ -44,13 +45,13 @@ module.exports = function (app) {
var result = await cacheManager["AppTokenByHostsCache"].getCache(token, system.exTime);
if (result.status != 0) {
res.end(JSON.stringify(result));
return result;
return;
}
req.body.appInfo = result.data;
req.body.actionProcess = result.data.app_code;
var lst = [
"addOrder", "getH5PayUrl", "getOrderQrCode", "queryOrderStatus", "getOrderInfo","getOrderDeliveryInfo",
"getTmNclList", "getNeedInfo",
"addOrder", "getH5PayUrl", "getOrderQrCode", "queryOrderStatus", "getOrderInfo", "getOrderDeliveryInfo", "getOrderDeliveryFlowInfo",
"getNeedInfo",
"tmConfirm", "updateTmInfo",
"updateNclInfo", "updateContacts",
"updateCustomerInfo", "addOrderAndDelivery",
......@@ -61,6 +62,7 @@ module.exports = function (app) {
if (!userpin) {
result.status = system.noLogin;
result.msg = "req headers userpin can not be empty";
result.data = null;
res.end(JSON.stringify(result));
return;
} else {
......@@ -76,7 +78,7 @@ module.exports = function (app) {
result.status = system.noLogin;
result.msg = "user login is invalidation";
res.end(JSON.stringify(result));
return result;
return;
}
req.body.userInfo = result.data;
}
......
center-channel/app/front/entry/public/apidoc/platform/order.md
......@@ -4,7 +4,8 @@
1. [下其他订单](#addOtherOrder)
1. [获取H5支付链接](#getH5PayUrl)
1. [获取订单列表信息](#getOrderInfo)
1. [获取工商订单交付流程信息](#getIcbcOrderDeliveryStatus)
1. [获取工商订单交付流程信息](#getIcbcOrderDeliveryFlowInfo)
1. [获取商标订单交付信息](#getTmOrderDeliveryInfo)
## **<a name="addOrder"> 下商标订单</a>**
......@@ -190,8 +191,122 @@
``` javascript
{
"channelUserId":"15010929366",// Y 渠道用户Id
"pageIndex":1,// Y 当前页
"channelUserId":"15010929{
"status": 0,
"msg": "success",
"data": {
"tm": {
"picUrl": "https://gsb-zc.oss-cn-beijing.aliyuncs.com/zc_word2picb2bc98b9fc564ef2a1f4b3cbe9352f39.jpg",
"tmName": "testbiao",
"tmFormType": "3",
"colorizedPicUrl": "https://gsb-zc.oss-cn-beijing.aliyuncs.com/zc_word2picb2bc98b9fc564ef2a1f4b3cbe9352f39.jpg"
},
"apply": {
"code": "91310110398635929J",
"name": "上海辰者信息科技有限公司",
"smwjUrl": "",
"zipCode": "100000",
"gzwtsUrl": "https://gsb-zc.oss-cn-beijing.aliyuncs.com/zc_wts863215710393842862019914.jpg",
"applyAddr": "上海市杨浦区国定路346号三楼0624室",
"applyArea": "",
"customerType": "ent",
"identityCardNo": "",
"identityCardPdf": "",
"identityCardPic": "",
"businessLicensePdf": "https://gsb-zc.oss-cn-beijing.aliyuncs.com/zc_yyzz120315554031547442019316.pdf",
"businessLicensePic": "https://gsb-zc.oss-cn-beijing.aliyuncs.com/zc_yyzz120315554031547442019316.jpg"
},
"nclList": [
{
"tbCode": "TB26202002271337v5y9",
"nclCount": 2,
"nclThree": [
{
"code": "020008",
"name": "绘画用铝粉",
"pcode": "0202",
"disabled": "false",
"fullname": "020008 绘画用铝粉"
},
{
"code": "020005",
"name": "食品用着色剂",
"pcode": "0203",
"disabled": "false",
"fullname": "020005 食品用着色剂"
}
],
"payStatus": 1,
"ncloneCode": "02",
"ncloneName": "颜料油漆",
"submitTime": "",
"payStatusName": "待付款",
"deliveryStatus": "dsh",
"nclPublicExpense": 60,
"deliveryStatusName": "待审核"
}
]
},
"requestId": "fe7bb14275d94b48a041c371dfde50aa"
}
"pageIndex":1,// Y 当前页{
"status": 0,
"msg": "success",
"data": {
"tm": {
"picUrl": "https://gsb-zc.oss-cn-beijing.aliyuncs.com/zc_word2picb2bc98b9fc564ef2a1f4b3cbe9352f39.jpg",
"tmName": "testbiao",
"tmFormType": "3",
"colorizedPicUrl": "https://gsb-zc.oss-cn-beijing.aliyuncs.com/zc_word2picb2bc98b9fc564ef2a1f4b3cbe9352f39.jpg"
},
"apply": {
"code": "91310110398635929J",
"name": "上海辰者信息科技有限公司",
"smwjUrl": "",
"zipCode": "100000",
"gzwtsUrl": "https://gsb-zc.oss-cn-beijing.aliyuncs.com/zc_wts863215710393842862019914.jpg",
"applyAddr": "上海市杨浦区国定路346号三楼0624室",
"applyArea": "",
"customerType": "ent",
"identityCardNo": "",
"identityCardPdf": "",
"identityCardPic": "",
"businessLicensePdf": "https://gsb-zc.oss-cn-beijing.aliyuncs.com/zc_yyzz120315554031547442019316.pdf",
"businessLicensePic": "https://gsb-zc.oss-cn-beijing.aliyuncs.com/zc_yyzz120315554031547442019316.jpg"
},
"nclList": [
{
"tbCode": "TB26202002271337v5y9",
"nclCount": 2,
"nclThree": [
{
"code": "020008",
"name": "绘画用铝粉",
"pcode": "0202",
"disabled": "false",
"fullname": "020008 绘画用铝粉"
},
{
"code": "020005",
"name": "食品用着色剂",
"pcode": "0203",
"disabled": "false",
"fullname": "020005 食品用着色剂"
}
],
"payStatus": 1,
"ncloneCode": "02",
"ncloneName": "颜料油漆",
"submitTime": "",
"payStatusName": "待付款",
"deliveryStatus": "dsh",
"nclPublicExpense": 60,
"deliveryStatusName": "待审核"
}
]
},
"requestId": "fe7bb14275d94b48a041c371dfde50aa"
}
"pageSize":20,// Y 每页大小，最大为50
"channelItemName":"",// N 产品名称
"channelServiceNo":"",// N 渠道订单号
......@@ -259,18 +374,18 @@
```
## **<a name="getIcbcOrderDeliveryStatus"> 获取工商订单交付流程信息</a>**
## **<a name="getIcbcOrderDeliveryFlowInfo"> 获取工商订单交付流程信息</a>**
[返回到目录](#menu)
##### URL
[/web/opaction/order/springBoard]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
#### 请求头中需要增加userpin（用户登录后的凭证）的值
#### 渠道执行的类型 actionType：getOrderDeliveryInfo
#### 渠道执行的类型 actionType：getOrderDeliveryFlowInfo
``` javascript
{
"orderNo":"OT31202002191453Hpib33"// Y 订单号
"sourceOrderNo":"OT31202002191453Hpib33"// Y 订单号
}
```
......@@ -303,5 +418,83 @@
"requestId": "a277fb799d9f4dda9053fb8830f9d252"
}
```
## **<a name="getTmOrderDeliveryInfo"> 获取商标订单交付信息</a>**
[返回到目录](#menu)
##### URL
[/web/opaction/order/springBoard]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
#### 请求头中需要增加userpin（用户登录后的凭证）的值
#### 渠道执行的类型 actionType：getOrderDeliveryInfo
``` javascript
{
"orderNo":"OT31202002191453Hpib33"// Y 订单号
}
```
#### 返回结果
```javascript
{
"status": 0,// 0为成功，否则失败
"msg": "success",
"data": {
"apply": {//申请信息
"applyAddr": "上海市杨浦区国定路346号三楼0624室",//执照详细地址
"applyArea": "",//申请区域--暂时没有用到
"businessLicensePic": "https://gsb-zc.oss-cn-beijing.aliyuncs.com/zc_yyzz120315554031547442019316.jpg",//营业执照jpg地址
"businessLicensePdf": "https://gsb-zc.oss-cn-beijing.aliyuncs.com/zc_yyzz120315554031547442019316.pdf",//营业执照pdf地址
"code": "91310110398635929J",//统一社会信用代码
"customerType": "ent",//申请人类型 person个人，ent企业
"identityCardNo": "",//申请人身份证号--（申请类型为个人有此值）
"identityCardPic": "",//申请人身份证jpg地址--（申请类型为个人有此值）
"identityCardPdf": "", //申请人身份证pdf地址 --（申请类型为个人有此值）
"name": "上海辰者信息科技有限公司", //申请人名称
"gzwtsUrl": "https://gsb-zc.oss-cn-beijing.aliyuncs.com/zc_wts863215710393842862019914.jpg",//盖章委托书url
"smwjUrl":"",//说明文件url
"zipCode": "100000"//邮政编码
},
"tm": {
"colorizedPicUrl": "https://gsb-zc.oss-cn-beijing.aliyuncs.com/zc_word2picb2bc98b9fc564ef2a1f4b3cbe9352f39.jpg",//商标彩色图样
"tmName": "testbiao",//商标名称
"picUrl": "https://gsb-zc.oss-cn-beijing.aliyuncs.com/zc_word2picb2bc98b9fc564ef2a1f4b3cbe9352f39.jpg",//商标图样
"tmFormType": "3"//商标类型形式：1: 立体, 3: 字, 4: 图, 5: 字图, 6: 颜色, 7: 彩色
},
"nclList": [
{
"tbCode": "TB26202002271337v5y9",//提报号
"payStatus": 1,//付款状态
"payStatusName": "待付款",//付款状态名称
"ncloneCode": "02",//尼斯大类编码
"ncloneName": "颜料油漆",//尼斯大类名称
"submitTime": "",//提报时间
"deliveryStatus": "dsh",//交付流程状态
"deliveryStatusName": "待审核",//交付流程状态名称
"nclCount": 2,
"nclPublicExpense": 300,
"nclThree": [
{
"code": "020008",//小项编码
"disabled": false,
"fullname": "020008 绘画用铝粉",//小项编码加名称
"name": "绘画用铝粉",//小项名称
"pcode": "0202"//小项所属群组编码
},
{
"code": "020005",
"name": "食品用着色剂",
"pcode": "0203",
"disabled": "false",
"fullname": "020005 食品用着色剂"
}
]
}
]
},
"requestId": "fe7bb14275d94b48a041c371dfde50aa"
}
```
\ 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