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
b039d8c1
Commit
b039d8c1
authored
Mar 07, 2020
by
宋毅
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tj
parent
d67880ce
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
9 deletions
+14
-9
center-app/app/base/db/metadata/apps/platform.js
+6
-3
center-app/app/base/db/models/dbapp/app.js
+8
-0
center-app/app/base/service/impl/common/oplogSve.js
+0
-3
center-app/app/base/service/impl/common/pushlogSve.js
+0
-3
No files found.
center-app/app/base/db/metadata/apps/platform.js
View file @
b039d8c1
...
...
@@ -20,13 +20,16 @@ module.exports = {
},
"pdict"
:
{
//支付类型:00第三方应用自己支付(推送过来的都是已经付款的订单),10平台代收款
"pay_type"
:
{
"00"
:
"本00第三方应用自己支付"
,
"10"
:
"平台代收款"
},
//提报类型:00第三方应用自己交付,10平台进行交付
"delivery_type"
:
{
"00"
:
"00第三方应用自己交付"
,
"10"
:
"平台进行交付"
},
//定价类型
"price_type"
:
{
"mj"
:
"件"
,
"mc"
:
"次"
,
"mt"
:
"天"
,
"my"
:
"月"
,
"mn"
:
"年"
,
"qj"
:
"区间"
,
"mx"
:
"项"
},
"price_type"
:
{
"mj"
:
"件"
,
"mc"
:
"次"
,
"mt"
:
"天"
,
"my"
:
"月"
,
"mn"
:
"年"
,
"qj"
:
"区间"
,
"mx"
:
"项"
},
//接口类型
"interface_type"
:
{
"bd"
:
"本地"
,
"yc"
:
"远程"
},
//操作类型
"op_type"
:
{
"addOrder"
:
"添加订单"
,
"pushOrder"
:
"推送订单"
,
"pushBusiness"
:
"推送商机
"
},
"op_type"
:
{
"addOrder"
:
"添加订单"
,
"pushOrder"
:
"推送订单"
,
"pushBusiness"
:
"推送商机"
,
"pushUpdateOrder"
:
"推送修改订单"
,
"pushUpdateContacts"
:
"推送修改订单联系人
"
},
//---------
"logLevel"
:
{
"debug"
:
0
,
"info"
:
1
,
"warn"
:
2
,
"error"
:
3
,
"fatal"
:
4
},
...
...
center-app/app/base/db/models/dbapp/app.js
View file @
b039d8c1
...
...
@@ -20,6 +20,14 @@ module.exports = (db, DataTypes) => {
type
:
DataTypes
.
BOOLEAN
,
defaultValue
:
true
,
},
pay_type
:
{
type
:
DataTypes
.
ENUM
,
values
:
Object
.
keys
(
uiconfig
.
config
.
pdict
.
pay_type
)
},
delivery_type
:
{
type
:
DataTypes
.
ENUM
,
values
:
Object
.
keys
(
uiconfig
.
config
.
pdict
.
delivery_type
)
},
},
{
paranoid
:
false
,
//假的删除
underscored
:
true
,
...
...
center-app/app/base/service/impl/common/oplogSve.js
View file @
b039d8c1
...
...
@@ -4,7 +4,6 @@ var settings = require("../../../../config/settings");
class
OplogService
extends
ServiceBase
{
constructor
()
{
super
(
"common"
,
ServiceBase
.
getDaoName
(
OplogService
));
//this.appDao=system.getObject("db.appDao");
this
.
opLogUrl
=
settings
.
apiconfig
.
opLogUrl
();
this
.
opLogEsIsAdd
=
settings
.
apiconfig
.
opLogEsIsAdd
();
}
...
...
@@ -25,8 +24,6 @@ class OplogService extends ServiceBase {
var
rc
=
system
.
getObject
(
"util.execClient"
);
var
rtn
=
null
;
try
{
// var myDate = new Date();
// var tmpTitle=myDate.toLocaleString()+":"+qobj.optitle;
qobj
.
optitle
=
(
new
Date
()).
Format
(
"yyyy-MM-dd hh:mm:ss"
)
+
":"
+
qobj
.
optitle
;
if
(
this
.
opLogEsIsAdd
==
1
)
{
qobj
.
content
=
qobj
.
content
.
replace
(
"field list"
,
"字段列表"
)
...
...
center-app/app/base/service/impl/common/pushlogSve.js
View file @
b039d8c1
...
...
@@ -4,7 +4,6 @@ var settings = require("../../../../config/settings");
class
PushlogService
extends
ServiceBase
{
constructor
()
{
super
(
"common"
,
ServiceBase
.
getDaoName
(
PushlogService
));
//this.appDao=system.getObject("db.appDao");
this
.
opLogUrl
=
settings
.
apiconfig
.
opLogUrl
();
this
.
opLogEsIsAdd
=
settings
.
apiconfig
.
opLogEsIsAdd
();
}
...
...
@@ -19,8 +18,6 @@ class PushlogService extends ServiceBase {
var
rc
=
system
.
getObject
(
"util.execClient"
);
var
rtn
=
null
;
try
{
// var myDate = new Date();
// var tmpTitle=myDate.toLocaleString()+":"+qobj.optitle;
qobj
.
optitle
=
(
new
Date
()).
Format
(
"yyyy-MM-dd hh:mm:ss"
)
+
":"
+
qobj
.
optitle
;
if
(
this
.
opLogEsIsAdd
==
1
)
{
qobj
.
content
=
qobj
.
content
.
replace
(
"field list"
,
"字段列表"
)
...
...
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