Skip to content

Z
zhichan
Commit 4dc17ce0 by linboxuan
Options

tmInfo update and add tmTrademarkTypeUpdate

parent 8e5e3b66
Showing with 150 additions and 26 deletions
center-tmtransaction/app/base/api/impl/action/trademarktransaction.js
......@@ -43,6 +43,9 @@ class ProductAPI extends APIBase {
case "tmInfoDelete": // 2020 0903 lin 新增 标源管理删除
opResult = await this.trademarkTransactionSve.tmInfoDelete(pobj, pobj.actionBody);
break;
case "tmTrademarkTypeUpdate": // 2020 0917 lin 新增 批量设置类型
opResult = await this.trademarkTransactionSve.tmTrademarkTypeUpdate(pobj, pobj.actionBody);
break;
case "createjsonfile": // 2020 0908 lin 新增 json文件生成
opResult = await this.trademarkTransactionSve.createjsonfile();
break;
......
center-tmtransaction/app/base/service/impl/tm/trademarktransactionSve.js
......@@ -302,30 +302,42 @@ class TrademarktransactionService extends ServiceBase {
"message": "success",
"data": [
{
"id": 175623,
"pic_url": "123",
"excelName": "商标名字",
"code": "123123",
"ncl_one_code": "ali",
"channel_name": "ali",
"business_quoted_price": "123",
"tm_start_day": "0122-12-31T15:54:17.000Z",
"tm_end_day": "0122-12-31T15:54:17.000Z",
"publish_status_name": "审核中",
"created_at": "2020-09-03T03:08:24.000Z"
"id": 209101,
"pic_url": "http://43.247.184.94:7170/Img/000/224/262/44A/d1cf283e-f9a2-4a6e-9ab5-1ac74f41d281.jpg",
"excelName": "萌颜",
"code": "22426244",
"contacts": "公司宝",
"mobile": "13333333333",
"name": "萌颜",
"trademark_type_name": "普通商标",
"ncl_one_code": "42",
"channel_name": "公司宝",
"tm_applier": "北京联大共享科技有限公司",// 申请主体
"business_quoted_price": "1000",
"platform_quoted_price": "2200",
"tm_start_day": "2018-02-06T00:00:00.000Z",
"tm_end_day": "2028-02-06T00:00:00.000Z",
"publish_status_name": "待审",
"created_at": "2020-09-17T07:09:33.000Z"
},
{
"id": 175624,
"pic_url": "123",
"excelName": "商标名字",
"code": "123123",
"ncl_one_code": "ali",
"channel_name": null,
"business_quoted_price": "123",
"tm_start_day": "0122-12-31T15:54:17.000Z",
"tm_end_day": "0122-12-31T15:54:17.000Z",
"publish_status_name": "审核中",
"created_at": "2020-09-03T03:08:24.000Z"
"id": 209102,
"pic_url": "http://43.247.184.94:7170/Img/000/224/262/44A/d1cf283e-f9a2-4a6e-9ab5-1ac74f41d281.jpg",
"excelName": "萌颜",
"code": "22426244",
"contacts": "公司宝",
"mobile": "13333333333",
"name": "萌颜",
"trademark_type_name": "普通商标",
"ncl_one_code": "42",
"channel_name": "公司宝",
"tm_applier": "北京联大共享科技有限公司",// 申请主体
"business_quoted_price": "1000",
"platform_quoted_price": "2200",
"tm_start_day": "2018-02-06T00:00:00.000Z",
"tm_end_day": "2028-02-06T00:00:00.000Z",
"publish_status_name": "待审",
"created_at": "2020-09-17T07:09:33.000Z"
}
],
"totalCount": 2,
......@@ -390,6 +402,7 @@ class TrademarktransactionService extends ServiceBase {
"trademark_type_name",
"ncl_one_code",
"channel_name",
"tm_applier",
"business_quoted_price",
"platform_quoted_price",
"tm_start_day",
......@@ -633,6 +646,40 @@ class TrademarktransactionService extends ServiceBase {
var res = await this.dao.update(actionBody)
return system.getResultSuccess(res);
}
/**
* @api {post} /tmtransaction/action/trademarktransaction/springBoard 批量设置类型
* @apiGroup 标源管理
* @apiParamExample {json} 请求参数
* {
"actionType": "tmTrademarkTypeUpdate",
"actionBody": [
{
"id": 209101,
"trademark_type":"hot"
},
{
"id": 209102,
"trademark_type":"hot"
}
]
}
* @apiSuccessExample {json} 成功示例:
* {"status":1,"message":"success","data":[[1],[1]],"requestId":"16794a60-f8b8-11ea-b763-65103acda465"}
* @apiErrorExample {json} 失败示例:
* {"error": ""}
*/
async tmTrademarkTypeUpdate(pobj, actionBody) {
if (!pobj || !pobj.actionBody) {
return system.getResultFail(-106, "参数错误");
}
var res = [];
for(var i = 0;i < actionBody.length;i++) {
var updateRes = await this.dao.update(actionBody[i])
res.push(updateRes);
}
return system.getResultSuccess(res);
}
/**
* @api {post} /tmtransaction/action/trademarktransaction/springBoard 删除
* @apiGroup 标源管理
......
center-tmtransaction/app/front/entry/public/apidoc/api_data.js
......@@ -54,7 +54,7 @@ define({ "api": [
"examples": [
{
"title": "成功示例:",
"content": "{\n \"status\": 1,\n \"message\": \"success\",\n \"data\": [\n {\n \"id\": 175623,\n \"pic_url\": \"123\",\n \"excelName\": \"商标名字\",\n \"code\": \"123123\",\n \"ncl_one_code\": \"ali\",\n \"channel_name\": \"ali\",\n \"business_quoted_price\": \"123\",\n \"tm_start_day\": \"0122-12-31T15:54:17.000Z\",\n \"tm_end_day\": \"0122-12-31T15:54:17.000Z\",\n \"publish_status_name\": \"审核中\",\n \"created_at\": \"2020-09-03T03:08:24.000Z\"\n },\n {\n \"id\": 175624,\n \"pic_url\": \"123\",\n \"excelName\": \"商标名字\",\n \"code\": \"123123\",\n \"ncl_one_code\": \"ali\",\n \"channel_name\": null,\n \"business_quoted_price\": \"123\",\n \"tm_start_day\": \"0122-12-31T15:54:17.000Z\",\n \"tm_end_day\": \"0122-12-31T15:54:17.000Z\",\n \"publish_status_name\": \"审核中\",\n \"created_at\": \"2020-09-03T03:08:24.000Z\"\n }\n ],\n \"totalCount\": 2,\n \"requestId\": \"f5170ae0-edab-11ea-876c-a369a023378f\"\n }",
"content": "{\n \"status\": 1,\n \"message\": \"success\",\n \"data\": [\n {\n \"id\": 209101,\n \"pic_url\": \"http://43.247.184.94:7170/Img/000/224/262/44A/d1cf283e-f9a2-4a6e-9ab5-1ac74f41d281.jpg\",\n \"excelName\": \"萌颜\",\n \"code\": \"22426244\",\n \"contacts\": \"公司宝\",\n \"mobile\": \"13333333333\",\n \"name\": \"萌颜\",\n \"trademark_type_name\": \"普通商标\",\n \"ncl_one_code\": \"42\",\n \"channel_name\": \"公司宝\",\n \"tm_applier\": \"北京联大共享科技有限公司\",// 申请主体\n \"business_quoted_price\": \"1000\",\n \"platform_quoted_price\": \"2200\",\n \"tm_start_day\": \"2018-02-06T00:00:00.000Z\",\n \"tm_end_day\": \"2028-02-06T00:00:00.000Z\",\n \"publish_status_name\": \"待审\",\n \"created_at\": \"2020-09-17T07:09:33.000Z\"\n },\n {\n \"id\": 209102,\n \"pic_url\": \"http://43.247.184.94:7170/Img/000/224/262/44A/d1cf283e-f9a2-4a6e-9ab5-1ac74f41d281.jpg\",\n \"excelName\": \"萌颜\",\n \"code\": \"22426244\",\n \"contacts\": \"公司宝\",\n \"mobile\": \"13333333333\",\n \"name\": \"萌颜\",\n \"trademark_type_name\": \"普通商标\",\n \"ncl_one_code\": \"42\",\n \"channel_name\": \"公司宝\",\n \"tm_applier\": \"北京联大共享科技有限公司\",// 申请主体\n \"business_quoted_price\": \"1000\",\n \"platform_quoted_price\": \"2200\",\n \"tm_start_day\": \"2018-02-06T00:00:00.000Z\",\n \"tm_end_day\": \"2028-02-06T00:00:00.000Z\",\n \"publish_status_name\": \"待审\",\n \"created_at\": \"2020-09-17T07:09:33.000Z\"\n }\n ],\n \"totalCount\": 2,\n \"requestId\": \"f5170ae0-edab-11ea-876c-a369a023378f\"\n }",
"type": "json"
}
]
......@@ -187,6 +187,43 @@ define({ "api": [
{
"type": "post",
"url": "/tmtransaction/action/trademarktransaction/springBoard",
"title": "批量设置类型",
"group": "标源管理",
"parameter": {
"examples": [
{
"title": "请求参数",
"content": "{\n \"actionType\": \"tmTrademarkTypeUpdate\",\n \"actionBody\": [\n {\n \"id\": 209101,\n \"trademark_type\":\"hot\"\n },\n {\n \"id\": 209102,\n \"trademark_type\":\"hot\"\n }\n ]\n }",
"type": "json"
}
]
},
"success": {
"examples": [
{
"title": "成功示例:",
"content": "{\"status\":1,\"message\":\"success\",\"data\":[[1],[1]],\"requestId\":\"16794a60-f8b8-11ea-b763-65103acda465\"}",
"type": "json"
}
]
},
"error": {
"examples": [
{
"title": "失败示例:",
"content": "{\"error\": \"\"}",
"type": "json"
}
]
},
"version": "0.0.0",
"filename": "app/base/service/impl/tm/trademarktransactionSve.js",
"groupTitle": "标源管理",
"name": "PostTmtransactionActionTrademarktransactionSpringboard"
},
{
"type": "post",
"url": "/tmtransaction/action/trademarktransaction/springBoard",
"title": "删除",
"group": "标源管理",
"parameter": {
......
center-tmtransaction/app/front/entry/public/apidoc/api_data.json
......@@ -54,7 +54,7 @@
"examples": [
{
"title": "成功示例:",
"content": "{\n \"status\": 1,\n \"message\": \"success\",\n \"data\": [\n {\n \"id\": 175623,\n \"pic_url\": \"123\",\n \"excelName\": \"商标名字\",\n \"code\": \"123123\",\n \"ncl_one_code\": \"ali\",\n \"channel_name\": \"ali\",\n \"business_quoted_price\": \"123\",\n \"tm_start_day\": \"0122-12-31T15:54:17.000Z\",\n \"tm_end_day\": \"0122-12-31T15:54:17.000Z\",\n \"publish_status_name\": \"审核中\",\n \"created_at\": \"2020-09-03T03:08:24.000Z\"\n },\n {\n \"id\": 175624,\n \"pic_url\": \"123\",\n \"excelName\": \"商标名字\",\n \"code\": \"123123\",\n \"ncl_one_code\": \"ali\",\n \"channel_name\": null,\n \"business_quoted_price\": \"123\",\n \"tm_start_day\": \"0122-12-31T15:54:17.000Z\",\n \"tm_end_day\": \"0122-12-31T15:54:17.000Z\",\n \"publish_status_name\": \"审核中\",\n \"created_at\": \"2020-09-03T03:08:24.000Z\"\n }\n ],\n \"totalCount\": 2,\n \"requestId\": \"f5170ae0-edab-11ea-876c-a369a023378f\"\n }",
"content": "{\n \"status\": 1,\n \"message\": \"success\",\n \"data\": [\n {\n \"id\": 209101,\n \"pic_url\": \"http://43.247.184.94:7170/Img/000/224/262/44A/d1cf283e-f9a2-4a6e-9ab5-1ac74f41d281.jpg\",\n \"excelName\": \"萌颜\",\n \"code\": \"22426244\",\n \"contacts\": \"公司宝\",\n \"mobile\": \"13333333333\",\n \"name\": \"萌颜\",\n \"trademark_type_name\": \"普通商标\",\n \"ncl_one_code\": \"42\",\n \"channel_name\": \"公司宝\",\n \"tm_applier\": \"北京联大共享科技有限公司\",// 申请主体\n \"business_quoted_price\": \"1000\",\n \"platform_quoted_price\": \"2200\",\n \"tm_start_day\": \"2018-02-06T00:00:00.000Z\",\n \"tm_end_day\": \"2028-02-06T00:00:00.000Z\",\n \"publish_status_name\": \"待审\",\n \"created_at\": \"2020-09-17T07:09:33.000Z\"\n },\n {\n \"id\": 209102,\n \"pic_url\": \"http://43.247.184.94:7170/Img/000/224/262/44A/d1cf283e-f9a2-4a6e-9ab5-1ac74f41d281.jpg\",\n \"excelName\": \"萌颜\",\n \"code\": \"22426244\",\n \"contacts\": \"公司宝\",\n \"mobile\": \"13333333333\",\n \"name\": \"萌颜\",\n \"trademark_type_name\": \"普通商标\",\n \"ncl_one_code\": \"42\",\n \"channel_name\": \"公司宝\",\n \"tm_applier\": \"北京联大共享科技有限公司\",// 申请主体\n \"business_quoted_price\": \"1000\",\n \"platform_quoted_price\": \"2200\",\n \"tm_start_day\": \"2018-02-06T00:00:00.000Z\",\n \"tm_end_day\": \"2028-02-06T00:00:00.000Z\",\n \"publish_status_name\": \"待审\",\n \"created_at\": \"2020-09-17T07:09:33.000Z\"\n }\n ],\n \"totalCount\": 2,\n \"requestId\": \"f5170ae0-edab-11ea-876c-a369a023378f\"\n }",
"type": "json"
}
]
......@@ -187,6 +187,43 @@
{
"type": "post",
"url": "/tmtransaction/action/trademarktransaction/springBoard",
"title": "批量设置类型",
"group": "标源管理",
"parameter": {
"examples": [
{
"title": "请求参数",
"content": "{\n \"actionType\": \"tmTrademarkTypeUpdate\",\n \"actionBody\": [\n {\n \"id\": 209101,\n \"trademark_type\":\"hot\"\n },\n {\n \"id\": 209102,\n \"trademark_type\":\"hot\"\n }\n ]\n }",
"type": "json"
}
]
},
"success": {
"examples": [
{
"title": "成功示例:",
"content": "{\"status\":1,\"message\":\"success\",\"data\":[[1],[1]],\"requestId\":\"16794a60-f8b8-11ea-b763-65103acda465\"}",
"type": "json"
}
]
},
"error": {
"examples": [
{
"title": "失败示例:",
"content": "{\"error\": \"\"}",
"type": "json"
}
]
},
"version": "0.0.0",
"filename": "app/base/service/impl/tm/trademarktransactionSve.js",
"groupTitle": "标源管理",
"name": "PostTmtransactionActionTrademarktransactionSpringboard"
},
{
"type": "post",
"url": "/tmtransaction/action/trademarktransaction/springBoard",
"title": "删除",
"group": "标源管理",
"parameter": {
......
center-tmtransaction/app/front/entry/public/apidoc/api_project.js
......@@ -9,7 +9,7 @@ define({
"apidoc": "0.3.0",
"generator": {
"name": "apidoc",
"time": "2020-09-11T03:42:42.416Z",
"time": "2020-09-17T07:37:28.228Z",
"url": "https://apidocjs.com",
"version": "0.25.0"
}
......
center-tmtransaction/app/front/entry/public/apidoc/api_project.json
......@@ -9,7 +9,7 @@
"apidoc": "0.3.0",
"generator": {
"name": "apidoc",
"time": "2020-09-11T03:42:42.416Z",
"time": "2020-09-17T07:37:28.228Z",
"url": "https://apidocjs.com",
"version": "0.25.0"
}
......
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