Skip to content

Z
zhichan
Commit 432aa037 by 宋毅
Options

tj

parent 9ca660cc
Showing with 220 additions and 12 deletions
igirl-channel/app/base/db/models/common/oplog.js
...@@ -14,13 +14,13 @@ module.exports = (db, DataTypes) => { ...@@ -14,13 +14,13 @@ module.exports = (db, DataTypes) => {
}, },
op: DataTypes.STRING, op: DataTypes.STRING,
content: DataTypes.STRING(5000), content: DataTypes.STRING(5000),
resultInfo: DataTypes.TEXT, resultInfo: DataTypes.TEXT('long'),
clientIp: DataTypes.STRING, clientIp: DataTypes.STRING,
agent: { agent: {
type: DataTypes.STRING, type: DataTypes.STRING,
allowNull: true, allowNull: true,
}, },
opTitle: DataTypes.STRING(500), opTitle: DataTypes.TEXT,
}, { }, {
paranoid: false,//假的删除 paranoid: false,//假的删除
underscored: true, underscored: true,
......
igirl-channel/app/base/db/models/common/pushlog.js
...@@ -13,8 +13,8 @@ module.exports = (db, DataTypes) => { ...@@ -13,8 +13,8 @@ module.exports = (db, DataTypes) => {
defaultValue: "info", defaultValue: "info",
}, },
op: DataTypes.STRING, op: DataTypes.STRING,
content: DataTypes.STRING(5000), content: DataTypes.TEXT,
resultInfo: DataTypes.TEXT, resultInfo: DataTypes.TEXT('long'),
returnTypeName:DataTypes.STRING, returnTypeName:DataTypes.STRING,
returnType : { returnType : {
type: DataTypes.ENUM, type: DataTypes.ENUM,
......
igirl-channel/app/base/service/impl/dborder/orderSve.js
...@@ -54,7 +54,7 @@ class OrderService extends ServiceBase { ...@@ -54,7 +54,7 @@ class OrderService extends ServiceBase {
"bizStatus": "S", "bizStatus": "S",
"paymentAmount": 420, "paymentAmount": 420,
"executePrice": 420, "executePrice": 420,
"orderItemNum": "ZQ3120025200_01", "orderItemNum": "ZQQ3120025200_01",
"gmtServiceBegin": "20171231000000000+0800", "gmtServiceBegin": "20171231000000000+0800",
"gmtConfirm": "20171231200329000+0800", "gmtConfirm": "20171231200329000+0800",
"settleItemDtos": [], "settleItemDtos": [],
...@@ -70,7 +70,7 @@ class OrderService extends ServiceBase { ...@@ -70,7 +70,7 @@ class OrderService extends ServiceBase {
"bizStatus": "S", "bizStatus": "S",
"paymentAmount": 420, "paymentAmount": 420,
"executePrice": 420, "executePrice": 420,
"orderItemNum": "ZQ3120025200_02", "orderItemNum": "ZQQ3120025200_02",
"gmtServiceBegin": "20171231000000000+0800", "gmtServiceBegin": "20171231000000000+0800",
"gmtConfirm": "20171231200329000+0800", "gmtConfirm": "20171231200329000+0800",
"settleItemDtos": [], "settleItemDtos": [],
...@@ -86,7 +86,7 @@ class OrderService extends ServiceBase { ...@@ -86,7 +86,7 @@ class OrderService extends ServiceBase {
"bizStatus": "S", "bizStatus": "S",
"paymentAmount": 420, "paymentAmount": 420,
"executePrice": 420, "executePrice": 420,
"orderItemNum": "ZQ3120025200_03", "orderItemNum": "ZQQ3120025200_03",
"gmtServiceBegin": "20171231000000000+0800", "gmtServiceBegin": "20171231000000000+0800",
"gmtConfirm": "20171231200329000+0800", "gmtConfirm": "20171231200329000+0800",
"settleItemDtos": [], "settleItemDtos": [],
...@@ -102,7 +102,7 @@ class OrderService extends ServiceBase { ...@@ -102,7 +102,7 @@ class OrderService extends ServiceBase {
"bizStatus": "S", "bizStatus": "S",
"paymentAmount": 420, "paymentAmount": 420,
"executePrice": 420, "executePrice": 420,
"orderItemNum": "ZQ3120025200_04", "orderItemNum": "ZQQ3120025200_04",
"gmtServiceBegin": "20171231000000000+0800", "gmtServiceBegin": "20171231000000000+0800",
"gmtConfirm": "20171231200329000+0800", "gmtConfirm": "20171231200329000+0800",
"settleItemDtos": [], "settleItemDtos": [],
...@@ -118,7 +118,7 @@ class OrderService extends ServiceBase { ...@@ -118,7 +118,7 @@ class OrderService extends ServiceBase {
"bizStatus": "S", "bizStatus": "S",
"paymentAmount": 420, "paymentAmount": 420,
"executePrice": 420, "executePrice": 420,
"orderItemNum": "ZQ3120025200_05", "orderItemNum": "ZQQ3120025200_05",
"gmtServiceBegin": "20171231000000000+0800", "gmtServiceBegin": "20171231000000000+0800",
"gmtConfirm": "20171231200329000+0800", "gmtConfirm": "20171231200329000+0800",
"settleItemDtos": [], "settleItemDtos": [],
...@@ -134,7 +134,7 @@ class OrderService extends ServiceBase { ...@@ -134,7 +134,7 @@ class OrderService extends ServiceBase {
"bizStatus": "S", "bizStatus": "S",
"paymentAmount": 420, "paymentAmount": 420,
"executePrice": 420, "executePrice": 420,
"orderItemNum": "ZQ3120025200_06", "orderItemNum": "ZQQ3120025200_06",
"gmtServiceBegin": "20171231000000000+0800", "gmtServiceBegin": "20171231000000000+0800",
"gmtConfirm": "20171231200329000+0800", "gmtConfirm": "20171231200329000+0800",
"settleItemDtos": [], "settleItemDtos": [],
...@@ -150,7 +150,215 @@ class OrderService extends ServiceBase { ...@@ -150,7 +150,215 @@ class OrderService extends ServiceBase {
"bizStatus": "S", "bizStatus": "S",
"paymentAmount": 420, "paymentAmount": 420,
"executePrice": 420, "executePrice": 420,
"orderItemNum": "ZQ3120025200_07", "orderItemNum": "ZQQ3120025200_07",
"gmtServiceBegin": "20171231000000000+0800",
"gmtConfirm": "20171231200329000+0800",
"settleItemDtos": [],
"payCustomerUid": "12345678990000",
"signCustomerUid": "12345678990000"
},
{
"bizStatusExt": "service",
"memberId": "b2b-****02",
"productName": "商机**",
"gmtCreate": "20171231200252000+0800",
"gmtServiceEnd": "20190101000000000+0800",
"bizStatus": "S",
"paymentAmount": 420,
"executePrice": 420,
"orderItemNum": "ZQQ3120025200_08",
"gmtServiceBegin": "20171231000000000+0800",
"gmtConfirm": "20171231200329000+0800",
"settleItemDtos": [],
"payCustomerUid": "12345678990000",
"signCustomerUid": "12345678990000"
},
{
"bizStatusExt": "service",
"memberId": "b2b-****02",
"productName": "商机**",
"gmtCreate": "20171231200252000+0800",
"gmtServiceEnd": "20190101000000000+0800",
"bizStatus": "S",
"paymentAmount": 420,
"executePrice": 420,
"orderItemNum": "ZQQ3120025200_09",
"gmtServiceBegin": "20171231000000000+0800",
"gmtConfirm": "20171231200329000+0800",
"settleItemDtos": [],
"payCustomerUid": "12345678990000",
"signCustomerUid": "12345678990000"
},
{
"bizStatusExt": "service",
"memberId": "b2b-****02",
"productName": "商机**",
"gmtCreate": "20171231200252000+0800",
"gmtServiceEnd": "20190101000000000+0800",
"bizStatus": "S",
"paymentAmount": 420,
"executePrice": 420,
"orderItemNum": "ZQQ3120025200_10",
"gmtServiceBegin": "20171231000000000+0800",
"gmtConfirm": "20171231200329000+0800",
"settleItemDtos": [],
"payCustomerUid": "12345678990000",
"signCustomerUid": "12345678990000"
},
{
"bizStatusExt": "service",
"memberId": "b2b-****02",
"productName": "商机**",
"gmtCreate": "20171231200252000+0800",
"gmtServiceEnd": "20190101000000000+0800",
"bizStatus": "S",
"paymentAmount": 420,
"executePrice": 420,
"orderItemNum": "ZQQ3120025200_11",
"gmtServiceBegin": "20171231000000000+0800",
"gmtConfirm": "20171231200329000+0800",
"settleItemDtos": [],
"payCustomerUid": "12345678990000",
"signCustomerUid": "12345678990000"
},
{
"bizStatusExt": "service",
"memberId": "b2b-****02",
"productName": "商机**",
"gmtCreate": "20171231200252000+0800",
"gmtServiceEnd": "20190101000000000+0800",
"bizStatus": "S",
"paymentAmount": 420,
"executePrice": 420,
"orderItemNum": "ZQQ3120025200_12",
"gmtServiceBegin": "20171231000000000+0800",
"gmtConfirm": "20171231200329000+0800",
"settleItemDtos": [],
"payCustomerUid": "12345678990000",
"signCustomerUid": "12345678990000"
},
{
"bizStatusExt": "service",
"memberId": "b2b-****02",
"productName": "商机**",
"gmtCreate": "20171231200252000+0800",
"gmtServiceEnd": "20190101000000000+0800",
"bizStatus": "S",
"paymentAmount": 420,
"executePrice": 420,
"orderItemNum": "ZQQ3120025200_13",
"gmtServiceBegin": "20171231000000000+0800",
"gmtConfirm": "20171231200329000+0800",
"settleItemDtos": [],
"payCustomerUid": "12345678990000",
"signCustomerUid": "12345678990000"
},
{
"bizStatusExt": "service",
"memberId": "b2b-****02",
"productName": "商机**",
"gmtCreate": "20171231200252000+0800",
"gmtServiceEnd": "20190101000000000+0800",
"bizStatus": "S",
"paymentAmount": 420,
"executePrice": 420,
"orderItemNum": "ZQQ3120025200_14",
"gmtServiceBegin": "20171231000000000+0800",
"gmtConfirm": "20171231200329000+0800",
"settleItemDtos": [],
"payCustomerUid": "12345678990000",
"signCustomerUid": "12345678990000"
},
{
"bizStatusExt": "service",
"memberId": "b2b-****02",
"productName": "商机**",
"gmtCreate": "20171231200252000+0800",
"gmtServiceEnd": "20190101000000000+0800",
"bizStatus": "S",
"paymentAmount": 420,
"executePrice": 420,
"orderItemNum": "ZQQ3120025200_15",
"gmtServiceBegin": "20171231000000000+0800",
"gmtConfirm": "20171231200329000+0800",
"settleItemDtos": [],
"payCustomerUid": "12345678990000",
"signCustomerUid": "12345678990000"
},
{
"bizStatusExt": "service",
"memberId": "b2b-****02",
"productName": "商机**",
"gmtCreate": "20171231200252000+0800",
"gmtServiceEnd": "20190101000000000+0800",
"bizStatus": "S",
"paymentAmount": 420,
"executePrice": 420,
"orderItemNum": "ZQQ3120025200_16",
"gmtServiceBegin": "20171231000000000+0800",
"gmtConfirm": "20171231200329000+0800",
"settleItemDtos": [],
"payCustomerUid": "12345678990000",
"signCustomerUid": "12345678990000"
},
{
"bizStatusExt": "service",
"memberId": "b2b-****02",
"productName": "商机**",
"gmtCreate": "20171231200252000+0800",
"gmtServiceEnd": "20190101000000000+0800",
"bizStatus": "S",
"paymentAmount": 420,
"executePrice": 420,
"orderItemNum": "ZQQ3120025200_17",
"gmtServiceBegin": "20171231000000000+0800",
"gmtConfirm": "20171231200329000+0800",
"settleItemDtos": [],
"payCustomerUid": "12345678990000",
"signCustomerUid": "12345678990000"
},
{
"bizStatusExt": "service",
"memberId": "b2b-****02",
"productName": "商机**",
"gmtCreate": "20171231200252000+0800",
"gmtServiceEnd": "20190101000000000+0800",
"bizStatus": "S",
"paymentAmount": 420,
"executePrice": 420,
"orderItemNum": "ZQQ3120025200_18",
"gmtServiceBegin": "20171231000000000+0800",
"gmtConfirm": "20171231200329000+0800",
"settleItemDtos": [],
"payCustomerUid": "12345678990000",
"signCustomerUid": "12345678990000"
},
{
"bizStatusExt": "service",
"memberId": "b2b-****02",
"productName": "商机**",
"gmtCreate": "20171231200252000+0800",
"gmtServiceEnd": "20190101000000000+0800",
"bizStatus": "S",
"paymentAmount": 420,
"executePrice": 420,
"orderItemNum": "ZQQ3120025200_19",
"gmtServiceBegin": "20171231000000000+0800",
"gmtConfirm": "20171231200329000+0800",
"settleItemDtos": [],
"payCustomerUid": "12345678990000",
"signCustomerUid": "12345678990000"
},
{
"bizStatusExt": "service",
"memberId": "b2b-****02",
"productName": "商机**",
"gmtCreate": "20171231200252000+0800",
"gmtServiceEnd": "20190101000000000+0800",
"bizStatus": "S",
"paymentAmount": 420,
"executePrice": 420,
"orderItemNum": "ZQQ3120025200_20",
"gmtServiceBegin": "20171231000000000+0800", "gmtServiceBegin": "20171231000000000+0800",
"gmtConfirm": "20171231200329000+0800", "gmtConfirm": "20171231200329000+0800",
"settleItemDtos": [], "settleItemDtos": [],
......
igirl-channel/app/base/service/impl/dborder/ordertmproductSve.js
...@@ -520,7 +520,7 @@ class OrderTmProductService extends ServiceBase { ...@@ -520,7 +520,7 @@ class OrderTmProductService extends ServiceBase {
* @param {*} params 格式：{channelServiceNo:XX, app:{ appId:XX}} * @param {*} params 格式：{channelServiceNo:XX, app:{ appId:XX}}
*/ */
async getTmOrderList(params, req) {//商标交付列表 async getTmOrderList(params, req) {//商标交付列表
var pageSize = Number(params.pageSize || 10); var pageSize = Number(params.pageSize || 20);
var pageInde = Number(params.pageInde || 1); var pageInde = Number(params.pageInde || 1);
var from = pageInde == 1 ? 0 : Number((pageInde - 1) * pageSize); var from = pageInde == 1 ? 0 : Number((pageInde - 1) * pageSize);
if (pageSize > 50) { if (pageSize > 50) {
......
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