Skip to content

Z
zhichan
Commit f16c5cf1 by 孙亚楠
Options

dd

parent 53611d82
Showing with 69 additions and 69 deletions
xggsve-order/app/base/db/models/order/obusinessmen.js
...@@ -59,13 +59,12 @@ module.exports = function (db, DataTypes) { ...@@ -59,13 +59,12 @@ module.exports = function (db, DataTypes) {
deliver_id: { type: DataTypes.STRING, field: 'deliver_id', allowNull: true ,comment:"交付商id"}, deliver_id: { type: DataTypes.STRING, field: 'deliver_id', allowNull: true ,comment:"交付商id"},
delier_user_id: { type: DataTypes.STRING, field: 'delier_user_id', allowNull: true ,comment:"交付商用户id"}, delier_user_id: { type: DataTypes.STRING, field: 'delier_user_id', allowNull: true ,comment:"交付商用户id"},
deliver_user_path: { type: DataTypes.STRING, field: 'deliver_user_path', allowNull: true ,comment:"交付商组织机构path"}, deliver_user_path: { type: DataTypes.STRING, field: 'deliver_user_path', allowNull: true ,comment:"交付商组织机构path"},
created_at: { type: DataTypes.DATE, field: 'created_at', allowNull: false}, created_at: { type: DataTypes.DATE, field: 'created_at', allowNull: true},
updated_at: { type: DataTypes.DATE, field: 'updated_at', allowNull: false}, updated_at: { type: DataTypes.DATE, field: 'updated_at', allowNull: true},
deleted_at: { type: DataTypes.DATE, field: 'deleted_at', allowNull: true } deleted_at: { type: DataTypes.DATE, field: 'deleted_at' }
}, },
{ {
timestamps: false, underscored: true,
underscore: true,
paranoid: true, paranoid: true,
version: true, version: true,
tableName: 'o_businessmen', tableName: 'o_businessmen',
......
xggsve-order/app/base/db/models/order/oorder.js
...@@ -24,8 +24,8 @@ module.exports = function (db, DataTypes) { ...@@ -24,8 +24,8 @@ module.exports = function (db, DataTypes) {
contact_mobile: {type: DataTypes.STRING, field: 'contact_mobile', allowNull: true, defaultValue:'', comment:'联系电话' }, contact_mobile: {type: DataTypes.STRING, field: 'contact_mobile', allowNull: true, defaultValue:'', comment:'联系电话' },
customer_name: {type: DataTypes.STRING, field: 'customer_name', allowNull: true, defaultValue:'', comment:'客户名称' }, customer_name: {type: DataTypes.STRING, field: 'customer_name', allowNull: true, defaultValue:'', comment:'客户名称' },
saas_deliver_api: {type: DataTypes.STRING, field: 'saas_deliver_api', allowNull: true, defaultValue:'', comment:'saas系统状态通知api' }, saas_deliver_api: {type: DataTypes.STRING, field: 'saas_deliver_api', allowNull: true, defaultValue:'', comment:'saas系统状态通知api' },
created_at: { type: DataTypes.DATE, field: 'created_at', allowNull: false, defaultValue: DataTypes.NOW }, created_at: { type: DataTypes.DATE, field: 'created_at', allowNull: true},
updated_at: { type: DataTypes.DATE, field: 'updated_at', allowNull: false, defaultValue: DataTypes.NOW }, updated_at: { type: DataTypes.DATE, field: 'updated_at', allowNull: true },
deleted_at: { type: DataTypes.DATE, field: 'deleted_at', allowNull: true } deleted_at: { type: DataTypes.DATE, field: 'deleted_at', allowNull: true }
}, },
{ {
......
xggsve-order/app/base/db/models/order/oorderdeliver.js
...@@ -20,13 +20,13 @@ module.exports = function (db, DataTypes) { ...@@ -20,13 +20,13 @@ module.exports = function (db, DataTypes) {
completed_at: { type: DataTypes.DATE, field: 'completed_at', allowNull: true, comment:'订单的完成时间' }, completed_at: { type: DataTypes.DATE, field: 'completed_at', allowNull: true, comment:'订单的完成时间' },
operator_id: { type: DataTypes.STRING, field: 'operator_id', allowNull: true, comment:'业务员id' }, operator_id: { type: DataTypes.STRING, field: 'operator_id', allowNull: true, comment:'业务员id' },
operator_path: { type: DataTypes.STRING, field: 'operator_path', allowNull: true, comment:'交付商业务员组织机构path' }, operator_path: { type: DataTypes.STRING, field: 'operator_path', allowNull: true, comment:'交付商业务员组织机构path' },
created_at: { type: DataTypes.DATE, field: 'created_at', allowNull: false, defaultValue: DataTypes.NOW }, created_at: { type: DataTypes.DATE, field: 'created_at', allowNull: true },
updated_at: { type: DataTypes.DATE, field: 'updated_at', allowNull: false, defaultValue: DataTypes.NOW }, updated_at: { type: DataTypes.DATE, field: 'updated_at', allowNull: true},
deleted_at: { type: DataTypes.DATE, field: 'deleted_at', allowNull: true } deleted_at: { type: DataTypes.DATE, field: 'deleted_at', allowNull: true }
}, },
{ {
timestamps: false, timestamps: false,
underscore: true, underscored: true,
paranoid: true, paranoid: true,
version: true, version: true,
tableName: 'o_order_deliver', tableName: 'o_order_deliver',
......
xggsve-order/app/base/db/models/order/oorderinforeg.js
...@@ -25,13 +25,13 @@ module.exports = function (db, DataTypes) { ...@@ -25,13 +25,13 @@ module.exports = function (db, DataTypes) {
guest_mail_no: {type: DataTypes.STRING, field: 'guest_mail_no', allowNull: true, defaultValue:'', comment:'客户快递单号' }, guest_mail_no: {type: DataTypes.STRING, field: 'guest_mail_no', allowNull: true, defaultValue:'', comment:'客户快递单号' },
guest_mail_img: {type: DataTypes.STRING, field: 'guest_mail_img', allowNull: true, defaultValue:'', comment:'交付商交付快递单号图片' }, guest_mail_img: {type: DataTypes.STRING, field: 'guest_mail_img', allowNull: true, defaultValue:'', comment:'交付商交付快递单号图片' },
guest_accpet_file: {type: DataTypes.STRING, field: 'guest_accpet_file', allowNull: true, defaultValue:'', comment:'客户验收文件' }, guest_accpet_file: {type: DataTypes.STRING, field: 'guest_accpet_file', allowNull: true, defaultValue:'', comment:'客户验收文件' },
created_at: { type: DataTypes.DATE, field: 'created_at', allowNull: false, defaultValue: DataTypes.NOW }, created_at: { type: DataTypes.DATE, field: 'created_at', allowNull: true},
updated_at: { type: DataTypes.DATE, field: 'updated_at', allowNull: false, defaultValue: DataTypes.NOW }, updated_at: { type: DataTypes.DATE, field: 'updated_at', allowNull: true},
deleted_at: { type: DataTypes.DATE, field: 'deleted_at', allowNull: true } deleted_at: { type: DataTypes.DATE, field: 'deleted_at', allowNull: true }
}, },
{ {
timestamps: false, timestamps: false,
underscore: true, underscored: true,
paranoid: true, paranoid: true,
version: true, version: true,
tableName: 'o_order_info_reg', tableName: 'o_order_info_reg',
......
xggsve-order/app/base/db/models/order/oorderprocess.js
...@@ -15,13 +15,13 @@ module.exports = function (db, DataTypes) { ...@@ -15,13 +15,13 @@ module.exports = function (db, DataTypes) {
name3: { type: DataTypes.STRING, field: 'name3', allowNull: true, comment:'状态3'}, name3: { type: DataTypes.STRING, field: 'name3', allowNull: true, comment:'状态3'},
name4: {type: DataTypes.STRING, field: 'name4', allowNull: true, comment:'状态4' }, name4: {type: DataTypes.STRING, field: 'name4', allowNull: true, comment:'状态4' },
sort: {type: DataTypes.BIGINT, field: 'sort', allowNull: false, defaultValue:1000, comment:'排序' }, sort: {type: DataTypes.BIGINT, field: 'sort', allowNull: false, defaultValue:1000, comment:'排序' },
created_at: { type: DataTypes.DATE, field: 'created_at', allowNull: false, defaultValue: DataTypes.NOW }, created_at: { type: DataTypes.DATE, field: 'created_at', allowNull: true},
updated_at: { type: DataTypes.DATE, field: 'updated_at', allowNull: false, defaultValue: DataTypes.NOW }, updated_at: { type: DataTypes.DATE, field: 'updated_at', allowNull: true },
deleted_at: { type: DataTypes.DATE, field: 'deleted_at', allowNull: true }, deleted_at: { type: DataTypes.DATE, field: 'deleted_at', allowNull: true },
}, },
{ {
timestamps: false, timestamps: false,
underscore: true, underscored: true,
paranoid: true, paranoid: true,
version: true, version: true,
tableName: 'o_order_process', tableName: 'o_order_process',
......
xggsve-order/app/base/db/models/order/oorderstatus.js
...@@ -4,27 +4,28 @@ ...@@ -4,27 +4,28 @@
*/ */
module.exports = function (db, DataTypes) { module.exports = function (db, DataTypes) {
return db.define('oorderstatus', { return db.define('oorderstatus', {
merchant_id: {type: DataTypes.STRING, field: 'merchant_id', allowNull: true, defaultValue:'',comment:'商户id, 为了兼容司机宝' }, merchant_id: {type: DataTypes.STRING, field: 'merchant_id', allowNull: true, defaultValue:'',comment:'商户id, 为了兼容司机宝' },
// order_id: {type: DataTypes.STRING, field: 'order_id', allowNull: true, comment:'订单ID' }, saas_id: {type: DataTypes.STRING, field: 'saas_id', allowNull: true, defaultValue:'',comment:'SAAS_ID' },
busi_type: {type: DataTypes.STRING, field: 'busi_type', allowNull: true,defaultValue:'', comment:'业务类型 1个体户 2...暂不知道' }, // order_id: {type: DataTypes.STRING, field: 'order_id', allowNull: true, comment:'订单ID' },
busi_id: { type: DataTypes.STRING, field: 'busi_id', allowNull: false,defaultValue:'', comment:'业务id'}, busi_type: {type: DataTypes.STRING, field: 'busi_type', allowNull: true,defaultValue:'', comment:'业务类型 1个体户 2...暂不知道' },
product_id: {type: DataTypes.BIGINT, field: 'product_id', allowNull: true,defaultValue:0, comment:'产品id'}, busi_id: { type: DataTypes.STRING, field: 'busi_id', allowNull: false,defaultValue:'', comment:'业务id'},
price: { type: DataTypes.BIGINT, field: 'price', allowNull: true, defaultValue:0,comment:'订单价格'}, product_id: {type: DataTypes.BIGINT, field: 'product_id', allowNull: true,defaultValue:0, comment:'产品id'},
status: {type: DataTypes.INTEGER, field: 'status', allowNull: true, defaultValue:'0',comment:'订单状态 业务进度' }, price: { type: DataTypes.BIGINT, field: 'price', allowNull: true, defaultValue:0,comment:'订单价格'},
assign_time: {type: DataTypes.DATE, field: 'assign_time', allowNull: true, defaultValue:null, comment:'分配时间' }, status: {type: DataTypes.INTEGER, field: 'status', allowNull: true, defaultValue:'0',comment:'订单状态 业务进度' },
assign_user_id: {type: DataTypes.BIGINT, field: 'assign_user_id', allowNull: true, defaultValue:'0', comment:'分配人id' }, assign_time: {type: DataTypes.DATE, field: 'assign_time', allowNull: true, defaultValue:null, comment:'分配时间' },
deliver_id: {type: DataTypes.STRING, field: 'deliver_id', allowNull: true, defaultValue:'', comment:'交付商id common微服务下' }, assign_user_id: {type: DataTypes.BIGINT, field: 'assign_user_id', allowNull: true, defaultValue:'0', comment:'分配人id' },
desc: {type: DataTypes.STRING, field: 'desc', allowNull: true, defaultValue:'', comment:'订单信息' }, deliver_id: {type: DataTypes.STRING, field: 'deliver_id', allowNull: true, defaultValue:'', comment:'交付商id common微服务下' },
bd_id: {type: DataTypes.STRING, field: 'bd_id', allowNull: true, defaultValue:'', comment:'业务员id' }, desc: {type: DataTypes.STRING, field: 'desc', allowNull: true, defaultValue:'', comment:'订单信息' },
bd_path: {type: DataTypes.BIGINT, field: 'bd_path', allowNull: true, defaultValue:'', comment:'业务员权限路径' }, bd_id: {type: DataTypes.STRING, field: 'bd_id', allowNull: true, defaultValue:'', comment:'业务员id' },
service_items: {type: DataTypes.STRING, field: 'service_items', allowNull: true, defaultValue:'', comment:'服务项json' }, bd_path: {type: DataTypes.BIGINT, field: 'bd_path', allowNull: true, defaultValue:'', comment:'业务员权限路径' },
service_remark: {type: DataTypes.STRING, field: 'service_remark', allowNull: true, defaultValue:'', comment:'服务信息备注' }, service_items: {type: DataTypes.STRING, field: 'service_items', allowNull: true, defaultValue:'', comment:'服务项json' },
source_id: {type: DataTypes.BIGINT, field: 'source_id', allowNull: true, defaultValue:0, comment:'来源id' }, service_remark: {type: DataTypes.STRING, field: 'service_remark', allowNull: true, defaultValue:'', comment:'服务信息备注' },
source_no: {type: DataTypes.STRING, field: 'source_no', allowNull: true, defaultValue:'', comment:'来源订单号' }, source_id: {type: DataTypes.BIGINT, field: 'source_id', allowNull: true, defaultValue:0, comment:'来源id' },
contact_mobile: {type: DataTypes.STRING, field: 'contact_mobile', allowNull: true, defaultValue:'', comment:'联系电话' }, source_no: {type: DataTypes.STRING, field: 'source_no', allowNull: true, defaultValue:'', comment:'来源订单号' },
created_at: { type: DataTypes.DATE, field: 'created_at', allowNull: false, defaultValue: DataTypes.NOW }, contact_mobile: {type: DataTypes.STRING, field: 'contact_mobile', allowNull: true, defaultValue:'', comment:'联系电话' },
updated_at: { type: DataTypes.DATE, field: 'updated_at', allowNull: false, defaultValue: DataTypes.NOW }, created_at: { type: DataTypes.DATE, field: 'created_at', allowNull: false},
deleted_at: { type: DataTypes.DATE, field: 'deleted_at', allowNull: true } updated_at: { type: DataTypes.DATE, field: 'updated_at', allowNull: false},
deleted_at: { type: DataTypes.DATE, field: 'deleted_at', allowNull: true }
}, },
{ {
paranoid: true, //假的删除 paranoid: true, //假的删除
......
xggsve-order/app/base/db/models/order/osource.js
...@@ -5,13 +5,13 @@ ...@@ -5,13 +5,13 @@
module.exports = function (db, DataTypes) { module.exports = function (db, DataTypes) {
return db.define('osource', { return db.define('osource', {
name: {type: DataTypes.STRING, field: 'name', allowNull: false, defaultValue:'',comment:'平台来源' }, name: {type: DataTypes.STRING, field: 'name', allowNull: false, defaultValue:'',comment:'平台来源' },
created_at: { type: DataTypes.DATE, field: 'created_at', allowNull: false, defaultValue: DataTypes.NOW }, created_at: { type: DataTypes.DATE, field: 'created_at', allowNull: false },
updated_at: { type: DataTypes.DATE, field: 'updated_at', allowNull: false, defaultValue: DataTypes.NOW }, updated_at: { type: DataTypes.DATE, field: 'updated_at', allowNull: false},
deleted_at: { type: DataTypes.DATE, field: 'deleted_at', allowNull: true } deleted_at: { type: DataTypes.DATE, field: 'deleted_at', allowNull: true }
}, },
{ {
timestamps: false, timestamps: false,
underscore: true, underscored: true,
paranoid: true, paranoid: true,
version: true, version: true,
tableName: 'o_source', tableName: 'o_source',
......
xggsve-order/app/base/db/models/product/oprocess.js
...@@ -7,13 +7,13 @@ module.exports = function (db, DataTypes) { ...@@ -7,13 +7,13 @@ module.exports = function (db, DataTypes) {
name: {type: DataTypes.STRING, field: 'name', allowNull: false, defaultValue:'', comment:'流程名称' }, name: {type: DataTypes.STRING, field: 'name', allowNull: false, defaultValue:'', comment:'流程名称' },
status: { type: DataTypes.STRING, field: 'status', allowNull: false,defaultValue:'', comment:'流程状态'}, status: { type: DataTypes.STRING, field: 'status', allowNull: false,defaultValue:'', comment:'流程状态'},
product_id: { type: DataTypes.STRING, field: 'product_id', allowNull: false,defaultValue:'', comment:'所属产品ID'}, product_id: { type: DataTypes.STRING, field: 'product_id', allowNull: false,defaultValue:'', comment:'所属产品ID'},
created_at: { type: DataTypes.DATE, field: 'created_at', allowNull: false, defaultValue: DataTypes.NOW }, created_at: { type: DataTypes.DATE, field: 'created_at', allowNull: false},
updated_at: { type: DataTypes.DATE, field: 'updated_at', allowNull: false, defaultValue: DataTypes.NOW }, updated_at: { type: DataTypes.DATE, field: 'updated_at', allowNull: false },
deleted_at: { type: DataTypes.DATE, field: 'deleted_at', allowNull: true } deleted_at: { type: DataTypes.DATE, field: 'deleted_at', allowNull: true }
}, },
{ {
timestamps: true, timestamps: true,
underscore: true, underscored: true,
paranoid: true, paranoid: true,
version: true, version: true,
tableName: 'o_process', tableName: 'o_process',
......
xggsve-order/app/base/db/models/product/oproduct.js
...@@ -10,13 +10,13 @@ module.exports = function (db, DataTypes) { ...@@ -10,13 +10,13 @@ module.exports = function (db, DataTypes) {
pid: { type: DataTypes.BIGINT, field: 'pid', allowNull: true, comment:'父ID'}, pid: { type: DataTypes.BIGINT, field: 'pid', allowNull: true, comment:'父ID'},
is_choose: { type: DataTypes.BOOLEAN, field: 'is_choose', allowNull: false, defaultValue:false, comment:'是否选择'}, is_choose: { type: DataTypes.BOOLEAN, field: 'is_choose', allowNull: false, defaultValue:false, comment:'是否选择'},
sort: {type: DataTypes.INTEGER, field: 'sort', allowNull: false, defaultValue:1000, comment:'排序' }, sort: {type: DataTypes.INTEGER, field: 'sort', allowNull: false, defaultValue:1000, comment:'排序' },
created_at: { type: DataTypes.DATE, field: 'created_at', allowNull: false, defaultValue: DataTypes.NOW }, created_at: { type: DataTypes.DATE, field: 'created_at', allowNull: false},
updated_at: { type: DataTypes.DATE, field: 'updated_at', allowNull: false, defaultValue: DataTypes.NOW }, updated_at: { type: DataTypes.DATE, field: 'updated_at', allowNull: false},
deleted_at: { type: DataTypes.DATE, field: 'deleted_at', allowNull: true }, deleted_at: { type: DataTypes.DATE, field: 'deleted_at', allowNull: true },
}, },
{ {
timestamps: false, timestamps: false,
underscore: true, underscored: true,
paranoid: true, paranoid: true,
version: true, version: true,
tableName: 'o_product', tableName: 'o_product',
......
xggsve-order/app/base/db/models/product/oproductprocess.js
...@@ -15,13 +15,13 @@ module.exports = function (db, DataTypes) { ...@@ -15,13 +15,13 @@ module.exports = function (db, DataTypes) {
name3: { type: DataTypes.STRING, field: 'name3', allowNull: true, comment:'状态3'}, name3: { type: DataTypes.STRING, field: 'name3', allowNull: true, comment:'状态3'},
name4: {type: DataTypes.STRING, field: 'name4', allowNull: true, comment:'状态4' }, name4: {type: DataTypes.STRING, field: 'name4', allowNull: true, comment:'状态4' },
sort: {type: DataTypes.INTEGER, field: 'sort', allowNull: false, defaultValue:1, comment:'排序' }, sort: {type: DataTypes.INTEGER, field: 'sort', allowNull: false, defaultValue:1, comment:'排序' },
created_at: { type: DataTypes.DATE, field: 'created_at', allowNull: false, defaultValue: DataTypes.NOW }, created_at: { type: DataTypes.DATE, field: 'created_at', allowNull: false },
updated_at: { type: DataTypes.DATE, field: 'updated_at', allowNull: false, defaultValue: DataTypes.NOW }, updated_at: { type: DataTypes.DATE, field: 'updated_at', allowNull: false},
deleted_at: { type: DataTypes.DATE, field: 'deleted_at', allowNull: true }, deleted_at: { type: DataTypes.DATE, field: 'deleted_at', allowNull: true },
}, },
{ {
timestamps: true, timestamps: true,
underscore: true, underscored: true,
paranoid: true, paranoid: true,
version: true, version: true,
tableName: 'o_product_process', tableName: 'o_product_process',
......
xggsve-order/app/base/db/models/saas/saasorderpay.js
...@@ -11,7 +11,7 @@ module.exports = (db, DataTypes) => { ...@@ -11,7 +11,7 @@ module.exports = (db, DataTypes) => {
trade_no: DataTypes.STRING, trade_no: DataTypes.STRING,
}, { }, {
paranoid: true, //假的删除 paranoid: true, //假的删除
underscored: true, underscored: true, // 不使用驼峰式命令规则，这样会在使用下划线分隔 这样 updatedAt 的字段名会是 updated_at
version: true, version: true,
freezeTableName: true, freezeTableName: true,
//freezeTableName: true, //freezeTableName: true,
......
xggsve-order/app/base/service/impl/order/obusinessmenSve.js
...@@ -20,7 +20,7 @@ class ObusinessmenService extends ServiceBase { ...@@ -20,7 +20,7 @@ class ObusinessmenService extends ServiceBase {
async queryObusinessmen(params) { async queryObusinessmen(params) {
try { try {
let obj = await this.findById(this.trim(params.id)); let obj = await this.findById(this.trim(params.id));
this.handleDate(obj, ["created_at", "assignTime","reg_date","tax_reg_day","updated_at"], null, -8); this.handleDate(obj, ["created_at", "assignTime","reg_date","tax_reg_day","updated_at"], null, 8);
let attributes = ["source_no","saas_deliver_api"]; let attributes = ["source_no","saas_deliver_api"];
let order = await this.oorderDao.model.findOne({ let order = await this.oorderDao.model.findOne({
where:{ where:{
...@@ -70,7 +70,7 @@ class ObusinessmenService extends ServiceBase { ...@@ -70,7 +70,7 @@ class ObusinessmenService extends ServiceBase {
try { try {
let obj = await this.dao.findByCreditCode(credit_code,saas_id); let obj = await this.dao.findByCreditCode(credit_code,saas_id);
if(obj && obj.length>0){ if(obj && obj.length>0){
this.handleDate(obj[0], ["created_at", "assignTime","reg_date","tax_reg_day","updated_at"], null, -8); this.handleDate(obj[0], ["created_at", "assignTime","reg_date","tax_reg_day","updated_at"], null, 8);
}else{ }else{
obj = {}; obj = {};
} }
...@@ -247,7 +247,7 @@ class ObusinessmenService extends ServiceBase { ...@@ -247,7 +247,7 @@ class ObusinessmenService extends ServiceBase {
let list = await this.dao.listByCondition(params); let list = await this.dao.listByCondition(params);
if (list) { if (list) {
for (var row of list) { for (var row of list) {
this.handleDate(row, ["created_at", "assignTime","reg_date","tax_reg_day","updated_at"], null, -8); this.handleDate(row, ["created_at", "assignTime","reg_date","tax_reg_day","updated_at"], null, 8);
row.service_rate=system.f2y(row.service_rate); row.service_rate=system.f2y(row.service_rate);
row.cost_rate=system.f2y(row.cost_rate); row.cost_rate=system.f2y(row.cost_rate);
row.tax_rate=system.f2y(row.tax_rate); row.tax_rate=system.f2y(row.tax_rate);
......
xggsve-order/app/base/service/impl/order/oorderSve.js
...@@ -188,7 +188,7 @@ class OorderService extends ServiceBase { ...@@ -188,7 +188,7 @@ class OorderService extends ServiceBase {
row.next_status = JSON.parse(statusObj.next_status || "[]"); row.next_status = JSON.parse(statusObj.next_status || "[]");
row.status_name = statusObj.name; row.status_name = statusObj.name;
this.handleDate(row, ["created_at", "assign_time"], null, -8); this.handleDate(row, ["created_at", "assign_time"], null, 8);
return system.getResultSuccess(row); return system.getResultSuccess(row);
} }
...@@ -206,9 +206,9 @@ class OorderService extends ServiceBase { ...@@ -206,9 +206,9 @@ class OorderService extends ServiceBase {
await this.formateSource([order]); await this.formateSource([order]);
await this.formateProduct([order]); await this.formateProduct([order]);
this.handleDate(order, ["created_at", "sign_time", "assign_time"], "YYYY-MM-DD HH:mm:ss", -8); this.handleDate(order, ["created_at", "sign_time", "assign_time"], "YYYY-MM-DD HH:mm:ss", 8);
this.handleDate(businessmen, ["tax_reg_day", "created_at", 'reg_date'], "YYYY-MM-DD HH:mm:ss", -8); this.handleDate(businessmen, ["tax_reg_day", "created_at", 'reg_date'], "YYYY-MM-DD HH:mm:ss", 8);
this.handleDate(orderInfo, ["created_at"], "YYYY-MM-DD HH:mm:ss", -8); this.handleDate(orderInfo, ["created_at"], "YYYY-MM-DD HH:mm:ss", 8);
orderDeliver.deliver_divide = system.f2y(orderDeliver.deliver_divide); orderDeliver.deliver_divide = system.f2y(orderDeliver.deliver_divide);
orderInfo.capital = system.f2y(orderInfo.capital); orderInfo.capital = system.f2y(orderInfo.capital);
...@@ -435,7 +435,7 @@ class OorderService extends ServiceBase { ...@@ -435,7 +435,7 @@ class OorderService extends ServiceBase {
//格式化状态 //格式化状态
// await this.formateStatus(page.rows); // await this.formateStatus(page.rows);
for (let item of page.rows) { for (let item of page.rows) {
this.handleDate(item, ["created_at", "sign_time"], "YYYY-MM-DD HH:mm:ss", -8); this.handleDate(item, ["created_at", "sign_time"], "YYYY-MM-DD HH:mm:ss", 8);
} }
return system.getResult(page); return system.getResult(page);
...@@ -850,9 +850,9 @@ class OorderService extends ServiceBase { ...@@ -850,9 +850,9 @@ class OorderService extends ServiceBase {
//格式化产品服务项 //格式化产品服务项
await this.formateProduct(list); await this.formateProduct(list);
for(let element of list){ for(let element of list){
this.handleDate(element, ["created_at", "assign_time"], null, null); this.handleDate(element, ["created_at", "assign_time"], null, 8);
this.handleDate(element.odeliver, ["created_at", "completed_at"], null, -8); this.handleDate(element.odeliver, ["created_at", "completed_at"], null,8);
this.handleDate(element.obusinessmen, ["created_at", "reg_date","tax_reg_day", "service_begin_time","service_end_time","sign_time","create_account_time"], null, -8); this.handleDate(element.obusinessmen, ["created_at", "reg_date","tax_reg_day", "service_begin_time","service_end_time","sign_time","create_account_time"], null, 8);
if(element.obusinessmen.common_tax_ladder ){ if(element.obusinessmen.common_tax_ladder ){
element.obusinessmen.common_tax_ladder = JSON.parse(element.obusinessmen.common_tax_ladder); element.obusinessmen.common_tax_ladder = JSON.parse(element.obusinessmen.common_tax_ladder);
} }
......
xggsve-order/app/base/service/impl/order/oorderdeliverSve.js
...@@ -74,7 +74,7 @@ class OorderdeliverService extends ServiceBase { ...@@ -74,7 +74,7 @@ class OorderdeliverService extends ServiceBase {
await this.formateServiceItems(rows); await this.formateServiceItems(rows);
for (var row of rows) { for (var row of rows) {
this.handleDate(row, ["created_at", "completed_at"], "YYYY-MM-DD HH:mm:ss", -8); this.handleDate(row, ["created_at", "completed_at"], "YYYY-MM-DD HH:mm:ss", 8);
} }
let res = { let res = {
......
xggsve-order/app/base/service/impl/saas/saasorderSve.js
...@@ -30,7 +30,7 @@ class SaasOrderService extends ServiceBase { ...@@ -30,7 +30,7 @@ class SaasOrderService extends ServiceBase {
order.bminfo = await this.saasorderbminfoDao.getById(params.id); order.bminfo = await this.saasorderbminfoDao.getById(params.id);
order.saasOrderDeliverInfo = await this.saasorderdeliverinfoDao.getById(params.id); order.saasOrderDeliverInfo = await this.saasorderdeliverinfoDao.getById(params.id);
this.handleDate(order, ["created_at"], null, -8); this.handleDate(order, ["created_at"], null, 8);
await this.setOrderStatus([order]); await this.setOrderStatus([order]);
return system.getResultSuccess(order); return system.getResultSuccess(order);
} }
...@@ -47,14 +47,14 @@ class SaasOrderService extends ServiceBase { ...@@ -47,14 +47,14 @@ class SaasOrderService extends ServiceBase {
if (!order) { if (!order) {
return system.getResult(null, "订单不存在"); return system.getResult(null, "订单不存在");
} }
this.handleDate(order, ["created_at"], null, -8); this.handleDate(order, ["created_at"], null, 8);
await this.setOrderStatus([order]); await this.setOrderStatus([order]);
let bminfo = await this.saasorderbminfoDao.getById(params.id) || {}; let bminfo = await this.saasorderbminfoDao.getById(params.id) || {};
let deliverInfo = await this.saasorderdeliverinfoDao.getById(params.id) || {}; let deliverInfo = await this.saasorderdeliverinfoDao.getById(params.id) || {};
let payList = await this.saasorderpayDao.findByOrderId(params.id) || []; let payList = await this.saasorderpayDao.findByOrderId(params.id) || [];
let payInfo = payList.length > 0 ? payList[0] : {}; let payInfo = payList.length > 0 ? payList[0] : {};
this.handleDate(payInfo, ["created_at"], null, -8); this.handleDate(payInfo, ["created_at"], null, 8);
let result = { let result = {
baseInfo: { baseInfo: {
...@@ -123,7 +123,7 @@ class SaasOrderService extends ServiceBase { ...@@ -123,7 +123,7 @@ class SaasOrderService extends ServiceBase {
let payList = await this.saasorderpayDao.findByOrderId(params.id) || []; let payList = await this.saasorderpayDao.findByOrderId(params.id) || [];
let payInfo = payList.length > 0 ? payList[0] : {}; let payInfo = payList.length > 0 ? payList[0] : {};
this.handleDate(payInfo, ["created_at"], null, -8); this.handleDate(payInfo, ["created_at"], null, 8);
let result = { let result = {
baseInfo: { baseInfo: {
...@@ -636,7 +636,7 @@ class SaasOrderService extends ServiceBase { ...@@ -636,7 +636,7 @@ class SaasOrderService extends ServiceBase {
page.rows = await this.saasorderdeliverinfoDao.listByCondition(params); page.rows = await this.saasorderdeliverinfoDao.listByCondition(params);
if (page.rows) { if (page.rows) {
for (var row of page.rows) { for (var row of page.rows) {
this.handleDate(row, ["created_at"], null, -8); this.handleDate(row, ["created_at"], null, 8);
} }
} }
return system.getResultSuccess(page); return system.getResultSuccess(page);
......
xggsve-order/app/base/service/impl/saas/saasorderbusinessmenSve.js
...@@ -40,7 +40,7 @@ class SaasorderbusinessmenService extends ServiceBase { ...@@ -40,7 +40,7 @@ class SaasorderbusinessmenService extends ServiceBase {
let res = await this.dao.saasorderbusinessmenPage(params); let res = await this.dao.saasorderbusinessmenPage(params);
for (let item of res) { for (let item of res) {
this.handleDate(item, ["created_at", "reg_date", "service_begin_time", "service_end_time", "sign_time"], "YYYY-MM-DD HH:mm:ss", -8); this.handleDate(item, ["created_at", "reg_date", "service_begin_time", "service_end_time", "sign_time"], "YYYY-MM-DD HH:mm:ss", 8);
item.is_bank_name = item.is_bank ? "已开户" : "未开户"; item.is_bank_name = item.is_bank ? "已开户" : "未开户";
item.common_tax_ladder = JSON.parse(item.common_tax_ladder); item.common_tax_ladder = JSON.parse(item.common_tax_ladder);
item.common_other_ladder = JSON.parse(item.common_other_ladder); item.common_other_ladder = JSON.parse(item.common_other_ladder);
......
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