Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Z
zhichan
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
蒋勇
zhichan
Commits
ab3327f4
Commit
ab3327f4
authored
Apr 08, 2020
by
王昆
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gsb
parent
521c2ac1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
47 additions
and
46 deletions
+47
-46
xggsve-merchant/app/base/db/models/merchant/saasmerchantsign.js
+45
-45
xggsve-merchant/app/base/service/impl/merchant/saasmerchantSve.js
+2
-1
No files found.
xggsve-merchant/app/base/db/models/merchant/saasmerchantsign.js
View file @
ab3327f4
const
system
=
require
(
"../../../system"
);
const
system
=
require
(
"../../../system"
);
const
settings
=
require
(
"../../../../config/settings"
);
const
settings
=
require
(
"../../../../config/settings"
);
const
uiconfig
=
system
.
getUiConfig2
(
settings
.
appKey
);
const
uiconfig
=
system
.
getUiConfig2
(
settings
.
appKey
);
module
.
exports
=
(
db
,
DataTypes
)
=>
{
module
.
exports
=
(
db
,
DataTypes
)
=>
{
return
db
.
define
(
"saasmerchantsign"
,
{
return
db
.
define
(
"saasmerchantsign"
,
{
main_id
:
DataTypes
.
INTEGER
,
main_id
:
DataTypes
.
STRING
,
main_id_trade
:
DataTypes
.
STRING
,
begin_date
:
DataTypes
.
DATE
,
begin_date
:
DataTypes
.
DATE
,
end_date
:
DataTypes
.
DATE
,
end_date
:
DataTypes
.
DATE
,
bm_reg_price
:
DataTypes
.
INTEGER
,
bm_reg_price
:
DataTypes
.
INTEGER
,
invoice_service_rate
:
DataTypes
.
INTEGER
,
invoice_service_rate
:
DataTypes
.
INTEGER
,
trans_service_rate
:
DataTypes
.
INTEGER
,
trans_service_rate
:
DataTypes
.
INTEGER
,
},{
},
{
paranoid
:
true
,
//假的删除
paranoid
:
true
,
//假的删除
underscored
:
true
,
underscored
:
true
,
version
:
true
,
version
:
true
,
freezeTableName
:
true
,
freezeTableName
:
true
,
//freezeTableName: true,
//freezeTableName: true,
// define the table's name
// define the table's name
tableName
:
'saas_merchant_sign'
,
tableName
:
'saas_merchant_sign'
,
validate
:
{
validate
:
{},
},
indexes
:
[
indexes
:[
// Create a unique index on email
// Create a unique index on email
// {
// {
// unique: true,
// unique: true,
// fields: ['email']
// fields: ['email']
// },
// },
//
//
// // Creates a gin index on data with the jsonb_path_ops operator
// // Creates a gin index on data with the jsonb_path_ops operator
// {
// {
// fields: ['data'],
// fields: ['data'],
// using: 'gin',
// using: 'gin',
// operator: 'jsonb_path_ops'
// operator: 'jsonb_path_ops'
// },
// },
//
//
// // By default index name will be [table]_[fields]
// // By default index name will be [table]_[fields]
// // Creates a multi column partial index
// // Creates a multi column partial index
// {
// {
// name: 'public_by_author',
// name: 'public_by_author',
// fields: ['author', 'status'],
// fields: ['author', 'status'],
// where: {
// where: {
// status: 'public'
// status: 'public'
// }
// }
// },
// },
//
//
// // A BTREE index with a ordered field
// // A BTREE index with a ordered field
// {
// {
// name: 'title_index',
// name: 'title_index',
// method: 'BTREE',
// method: 'BTREE',
// fields: ['author', {attribute: 'title', collate: 'en_US', order: 'DESC', length: 5}]
// fields: ['author', {attribute: 'title', collate: 'en_US', order: 'DESC', length: 5}]
// }
// }
]
]
});
});
}
}
xggsve-merchant/app/base/service/impl/merchant/saasmerchantSve.js
View file @
ab3327f4
...
@@ -250,7 +250,8 @@ class SaasMerchantService extends ServiceBase {
...
@@ -250,7 +250,8 @@ class SaasMerchantService extends ServiceBase {
}
}
let
merchant
=
await
this
.
dao
.
findById
(
params
.
id
);
let
merchant
=
await
this
.
dao
.
findById
(
params
.
id
);
let
sign
=
await
this
.
saasmerchantsignDao
.
findById
(
params
.
id
);
let
sign
=
await
this
.
saasmerchantsignDao
.
findById
(
params
.
id
);
sign
.
main_id
=
Number
(
this
.
trim
(
params
.
main_id
)
||
0
);
sign
.
main_id
=
this
.
trim
(
params
.
main_id
);
sign
.
main_id_trade
=
this
.
trim
(
params
.
main_id_trade
);
sign
.
begin_date
=
this
.
trim
(
params
.
begin_date
);
sign
.
begin_date
=
this
.
trim
(
params
.
begin_date
);
sign
.
end_date
=
this
.
trim
(
params
.
end_date
);
sign
.
end_date
=
this
.
trim
(
params
.
end_date
);
sign
.
bm_reg_price
=
Number
(
params
.
bm_reg_price
||
0
);
sign
.
bm_reg_price
=
Number
(
params
.
bm_reg_price
||
0
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment