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
b289ea23
Commit
b289ea23
authored
Jan 07, 2020
by
王昆
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'xgg-web-dev' into xgg-web
parents
aae78afc
49eb7b35
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
585 additions
and
162 deletions
+585
-162
settings.js
+0
-112
xgg-web/app/base/db/models/bmorder.js
+3
-1
xgg-web/app/base/db/models/bmuser.js
+1
-0
xgg-web/app/base/service/impl/bmorderSve.js
+125
-16
xgg-web/app/base/wxapplet/applet.base.js
+30
-28
xgg-web/app/base/wxapplet/impl/chuangfuApplet.js
+126
-0
xgg-web/app/base/wxapplet/impl/xggApplet.js
+133
-4
xgg-web/恒昌api.txt
+167
-1
No files found.
settings.js
deleted
100644 → 0
View file @
aae78afc
var
path
=
require
(
'path'
);
var
ENVINPUT
=
{
DB_HOST
:
process
.
env
.
DB_HOST
,
DB_PORT
:
process
.
env
.
DB_PORT
,
DB_USER
:
process
.
env
.
DB_USER
,
DB_PWD
:
process
.
env
.
DB_PWD
,
DB_NAME
:
process
.
env
.
PAAS_DB_NAME
,
REDIS_HOST
:
process
.
env
.
REDIS_HOST
,
REDIS_PORT
:
process
.
env
.
REDIS_PORT
,
REDIS_PWD
:
process
.
env
.
REDIS_PWD
,
REDIS_DB
:
process
.
env
.
PAAS_REDIS_DB
,
APP_ENV
:
process
.
env
.
APP_ENV
?
process
.
env
.
APP_ENV
:
"dev"
};
var
settings
=
{
env
:
ENVINPUT
.
APP_ENV
,
platformid
:
1
,
platformcompanyid
:
1
,
commonroleid
:
1
,
passroleid
:
2
,
tanentroleid
:
1
,
protocalPrefix
:
"http://"
,
appKey
:
"wx76a324c5d201d1a4"
,
secret
:
"f99d413b767f09b5dff0b3610366cc46"
,
salt
:
"%iatpD1gcxz7iF#B"
,
defaultpwd
:
"987456"
,
basepath
:
path
.
normalize
(
path
.
join
(
__dirname
,
'../..'
)),
port
:
process
.
env
.
NODE_PORT
||
4001
,
reqEsAddr
:
function
()
{
if
(
this
.
env
==
"dev"
)
{
var
localsettings
=
require
(
"./localsettings"
);
return
"http://43.247.184.94:7200/"
;
//localsettings.reqEsDevUrl;
}
else
{
return
"http://43.247.184.94:7200/"
;
}
},
apiconfig
:
{
opLogUrl
:
function
()
{
return
settings
.
reqEsAddr
()
+
"bigdata_zc_op_log/_doc?pretty"
;
},
opLogEsIsAdd
:
function
()
{
return
1
;
},
},
homePage
:
function
()
{
if
(
this
.
env
==
"dev"
)
{
var
localsettings
=
require
(
"./localsettings"
);
return
localsettings
.
reqHomePageDevUrl
;
}
else
{
return
"http://open.gongsibao.com/"
;
}
},
authUrl
:
function
()
{
if
(
this
.
env
==
"dev"
)
{
var
localsettings
=
require
(
"./localsettings"
);
return
localsettings
.
reqAuthUrl
;
}
else
{
return
"http://open.gongsibao.com/auth"
;
}
},
docUrl
:
function
()
{
if
(
this
.
env
==
"dev"
)
{
var
localsettings
=
require
(
"./localsettings"
);
return
localsettings
.
docUrl
;
}
else
{
return
"http://open.gongsibao.com/web/common/metaCtl/getApiDoc"
;
}
},
redis
:
function
()
{
if
(
this
.
env
==
"dev"
)
{
var
localsettings
=
require
(
"./localsettings"
);
return
localsettings
.
redis
;
}
else
{
return
{
host
:
ENVINPUT
.
REDIS_HOST
,
port
:
ENVINPUT
.
REDIS_PORT
,
password
:
ENVINPUT
.
REDIS_PWD
,
db
:
ENVINPUT
.
REDIS_DB
,
};
}
},
database
:
function
()
{
if
(
this
.
env
==
"dev"
)
{
var
localsettings
=
require
(
"./localsettings"
);
return
localsettings
.
database
;
}
else
{
return
{
dbname
:
ENVINPUT
.
DB_NAME
,
user
:
ENVINPUT
.
DB_USER
,
password
:
ENVINPUT
.
DB_PWD
,
config
:
{
host
:
ENVINPUT
.
DB_HOST
,
dialect
:
'mysql'
,
operatorsAliases
:
false
,
pool
:
{
max
:
5
,
min
:
0
,
acquire
:
90000000
,
idle
:
1000000
},
debug
:
false
,
dialectOptions
:
{
requestTimeout
:
999999
,
// instanceName:'DEV'
}
//设置MSSQL超时时间
},
};
}
}
};
settings
.
ENVINPUT
=
ENVINPUT
;
module
.
exports
=
settings
;
\ No newline at end of file
xgg-web/app/base/db/models/bmorder.js
View file @
b289ea23
...
@@ -5,8 +5,10 @@ module.exports = (db, DataTypes) => {
...
@@ -5,8 +5,10 @@ module.exports = (db, DataTypes) => {
userId
:
DataTypes
.
INTEGER
,
userId
:
DataTypes
.
INTEGER
,
orderNo
:
DataTypes
.
STRING
(
100
),
orderNo
:
DataTypes
.
STRING
(
100
),
status
:
DataTypes
.
INTEGER
,
status
:
DataTypes
.
INTEGER
,
name
:
DataTypes
.
STRING
(
100
),
ownerId
:
DataTypes
.
INTEGER
,
ownerId
:
DataTypes
.
INTEGER
,
auditStatus
:{
type
:
DataTypes
.
INTEGER
,
field
:
'audit_status'
,
comment
:
'审核状态 0待审核 1审核通过 2审核驳回'
},
auditId
:{
type
:
DataTypes
.
INTEGER
,
field
:
'audit_id'
,
comment
:
'审核人ID'
},
rejectReason
:{
type
:
DataTypes
.
STRING
,
field
:
'reject_reason'
,
comment
:
'驳回原因'
},
},
{
},
{
paranoid
:
true
,
//假的删除
paranoid
:
true
,
//假的删除
underscored
:
true
,
underscored
:
true
,
...
...
xgg-web/app/base/db/models/bmuser.js
View file @
b289ea23
...
@@ -13,6 +13,7 @@ module.exports = (db, DataTypes) => {
...
@@ -13,6 +13,7 @@ module.exports = (db, DataTypes) => {
type
:
DataTypes
.
BOOLEAN
,
type
:
DataTypes
.
BOOLEAN
,
defaultValue
:
false
,
defaultValue
:
false
,
},
},
isAuditor
:{
type
:
DataTypes
.
INTEGER
,
field
:
'is_auditor'
,
comment
:
'是否有审核权限 0:没有 1 有'
},
},
{
},
{
paranoid
:
true
,
//假的删除
paranoid
:
true
,
//假的删除
underscored
:
true
,
underscored
:
true
,
...
...
xgg-web/app/base/service/impl/bmorderSve.js
View file @
b289ea23
const
system
=
require
(
"../../system"
);
const
system
=
require
(
"../../system"
);
const
ServiceBase
=
require
(
"../sve.base"
);
const
ServiceBase
=
require
(
"../sve.base"
);
class
BmorderService
extends
ServiceBase
{
class
BmorderService
extends
ServiceBase
{
constructor
(){
constructor
()
{
super
(
ServiceBase
.
getDaoName
(
BmorderService
));
super
(
ServiceBase
.
getDaoName
(
BmorderService
));
//this.appDao=system.getObject("db.appDao");
//this.appDao=system.getObject("db.appDao");
this
.
bmuserbizDao
=
system
.
getObject
(
"db.bmuserbizDao"
);
this
.
bmuserbizDao
=
system
.
getObject
(
"db.bmuserbizDao"
);
this
.
statusMap
=
{
0
:
"待审核"
,
1
:
"审核通过"
,
2
:
"审核驳回"
,
};
}
}
async
saveOrderBiz
(
orderData
)
{
async
saveOrderBiz
(
orderData
)
{
var
order
=
orderData
.
order
;
var
order
=
orderData
.
order
;
var
userbiz
=
orderData
.
userbiz
;
var
userbiz
=
orderData
.
userbiz
;
...
@@ -38,7 +41,7 @@ class BmorderService extends ServiceBase{
...
@@ -38,7 +41,7 @@ class BmorderService extends ServiceBase{
[
"id"
,
'desc'
]
[
"id"
,
'desc'
]
];
];
var
attributes
=
[
"id"
,
"merchantId"
,
"companyId"
,
"userId"
,
"orderNo"
,
"status"
,
"ownerId"
,
"created_at"
,
"updated_at"
];
var
attributes
=
[
"id"
,
"merchantId"
,
"companyId"
,
"userId"
,
"orderNo"
,
"status"
,
"
auditStatus"
,
"auditId"
,
"rejectReason"
,
"
ownerId"
,
"created_at"
,
"updated_at"
];
var
page
=
await
this
.
getPageList
(
currentPage
,
pageSize
,
where
,
orderby
,
attributes
);
var
page
=
await
this
.
getPageList
(
currentPage
,
pageSize
,
where
,
orderby
,
attributes
);
if
(
page
&&
page
.
rows
)
{
if
(
page
&&
page
.
rows
)
{
...
@@ -51,6 +54,117 @@ class BmorderService extends ServiceBase{
...
@@ -51,6 +54,117 @@ class BmorderService extends ServiceBase{
return
page
;
return
page
;
}
}
/**
* 根据状态查询订单列表 0待审核 1审核通过 2审核驳回
* @param {*} params
*/
async
unauditOrders
(
params
)
{
var
currentPage
=
Number
(
params
.
currentPage
||
0
);
var
pageSize
=
Number
(
params
.
pageSize
||
10
);
var
where
=
{
auditStatus
:
params
.
auditStatus
,
merchantId
:
params
.
merchantId
,
}
var
orderby
=
[
[
"id"
,
'desc'
]
];
var
attributes
=
[
"id"
,
"merchantId"
,
"companyId"
,
"userId"
,
"orderNo"
,
"status"
,
"auditStatus"
,
"auditId"
,
"rejectReason"
,
"ownerId"
,
"created_at"
,
"updated_at"
];
var
page
=
await
this
.
getPageList
(
currentPage
,
pageSize
,
where
,
orderby
,
attributes
);
if
(
page
&&
page
.
rows
)
{
await
this
.
setBizs
(
page
.
rows
);
await
this
.
setStatusName
(
page
.
rows
);
for
(
var
row
of
page
.
rows
)
{
this
.
handleDate
(
row
,
[
"created_at"
,
"updated_at"
],
null
,
-
8
);
}
}
return
page
;
}
/**
* 审核
*/
async
audit
(
params
)
{
try
{
await
this
.
dao
.
model
.
update
({
auditId
:
params
.
id
,
rejectReason
:
params
.
rejectReason
,
auditStatus
:
params
.
auditStatus
},
{
where
:
{
id
:
params
.
id
}
});
return
{
code
:
1
,
msg
:
"success"
};
}
catch
(
error
)
{
console
.
log
(
error
);
return
system
.
getResult
(
null
,
`系统错误 错误信息
${
error
}
`
);
}
}
/**
* 更新订单
* @param {*} params
*/
async
updateOrder
(
params
)
{
try
{
let
{
order
,
userbiz
,
loginUser
}
=
params
;
let
self
=
this
;
let
res
=
await
this
.
db
.
transaction
(
async
function
(
t
)
{
// 创建订单
await
self
.
dao
.
model
.
update
(
order
,{
where
:{
id
:
order
.
id
}},
t
);
// 创建用户材料
await
self
.
bmuserbizDao
.
model
.
update
(
userbiz
,{
where
:{
orderId
:
order
.
id
}}
,
t
);
});
return
{
code
:
1
,
msg
:
"success"
,
data
:
res
};
}
catch
(
error
)
{
console
.
log
(
error
);
return
system
.
getResult
(
null
,
error
);
}
}
/**
* 查询明细
* @param {*} params
*/
async
queryOrderInfo
(
params
){
if
(
!
params
.
id
){
return
system
.
getResult
(
null
,
`参数错误 订单ID 不能为空`
);
}
try
{
let
order
=
await
this
.
findById
(
params
.
id
);
if
(
!
order
)
{
return
system
.
getResult
(
null
,
`订单不存在`
);
}
order
.
dataValues
.
auditStatusName
=
this
.
statusMap
[
order
.
auditStatus
];
let
child
=
await
this
.
bmuserbizDao
.
findById
(
params
.
id
);
order
.
dataValues
.
child
=
child
||
{};
return
{
code
:
1
,
msg
:
"success"
,
orderInfo
:
order
};
}
catch
(
error
)
{
console
.
log
(
error
);
return
system
.
getResult
(
null
,
error
);
}
}
async
setBizs
(
list
)
{
async
setBizs
(
list
)
{
if
(
!
list
||
list
.
length
==
0
)
{
if
(
!
list
||
list
.
length
==
0
)
{
return
;
return
;
...
@@ -72,14 +186,9 @@ class BmorderService extends ServiceBase{
...
@@ -72,14 +186,9 @@ class BmorderService extends ServiceBase{
}
}
for
(
var
item
of
list
)
{
for
(
var
item
of
list
)
{
switch
(
item
.
status
)
{
item
.
auditStatusName
=
this
.
statusMap
[
item
.
auditStatus
];
case
0
:
{
item
.
statusName
=
"信息提交"
break
;
}
}
}
}
}
}
}
}
module
.
exports
=
BmorderService
;
module
.
exports
=
BmorderService
;
xgg-web/app/base/wxapplet/applet.base.js
View file @
b289ea23
...
@@ -10,7 +10,7 @@ class AppletBase {
...
@@ -10,7 +10,7 @@ class AppletBase {
this
.
cacheManager
=
system
.
getObject
(
"db.cacheManager"
);
this
.
cacheManager
=
system
.
getObject
(
"db.cacheManager"
);
this
.
redisClient
=
system
.
getObject
(
"util.redisClient"
);
this
.
redisClient
=
system
.
getObject
(
"util.redisClient"
);
this
.
rc
=
system
.
getObject
(
"util.execClient"
);
this
.
rc
=
system
.
getObject
(
"util.execClient"
);
if
(
!
config
)
{
if
(
!
config
)
{
throw
new
Error
(
"请传入小程序appid和secret配置"
);
throw
new
Error
(
"请传入小程序appid和secret配置"
);
}
}
this
.
wxConfig
=
config
;
this
.
wxConfig
=
config
;
...
@@ -31,11 +31,11 @@ class AppletBase {
...
@@ -31,11 +31,11 @@ class AppletBase {
return
null
;
return
null
;
}
}
}
}
async
getUserInfo
(
openid
,
merchantId
)
{
async
getUserInfo
(
openid
,
merchantId
)
{
let
key
;
let
key
;
if
(
merchantId
)
{
if
(
merchantId
)
{
key
=
merchantId
+
"_"
+
openid
;
key
=
merchantId
+
"_"
+
openid
;
}
else
{
}
else
{
key
=
openid
;
key
=
openid
;
}
}
return
this
.
cacheManager
[
"AppletUserinfoCache"
].
get
(
key
);
return
this
.
cacheManager
[
"AppletUserinfoCache"
].
get
(
key
);
...
@@ -71,7 +71,7 @@ class AppletBase {
...
@@ -71,7 +71,7 @@ class AppletBase {
console
.
log
(
rtn
);
console
.
log
(
rtn
);
console
.
log
(
"code2Sessioncode2Sessioncode2Session"
);
console
.
log
(
"code2Sessioncode2Sessioncode2Session"
);
var
result
=
JSON
.
parse
(
rtn
.
stdout
);
var
result
=
JSON
.
parse
(
rtn
.
stdout
);
if
(
result
&&
result
.
access_token
)
{
if
(
result
&&
result
.
access_token
)
{
}
}
return
result
;
return
result
;
}
catch
(
e
)
{
}
catch
(
e
)
{
...
@@ -83,13 +83,13 @@ class AppletBase {
...
@@ -83,13 +83,13 @@ class AppletBase {
type
=
type
||
1
;
type
=
type
||
1
;
var
key
=
"access_token_"
+
this
.
wxConfig
.
appid
;
var
key
=
"access_token_"
+
this
.
wxConfig
.
appid
;
var
ak
=
await
this
.
redisClient
.
get
(
key
);
var
ak
=
await
this
.
redisClient
.
get
(
key
);
if
(
ak
)
{
if
(
ak
)
{
return
ak
;
return
ak
;
}
else
{
}
else
{
var
rs
=
await
this
.
getAccessToken
(
type
);
var
rs
=
await
this
.
getAccessToken
(
type
);
if
(
rs
&&
rs
.
access_token
)
{
if
(
rs
&&
rs
.
access_token
)
{
ak
=
rs
.
access_token
;
ak
=
rs
.
access_token
;
await
this
.
redisClient
.
setWithEx
(
key
,
ak
,
7000
);
await
this
.
redisClient
.
setWithEx
(
key
,
ak
,
7000
);
}
}
}
}
...
@@ -99,10 +99,10 @@ class AppletBase {
...
@@ -99,10 +99,10 @@ class AppletBase {
async
getIdCardInfo
(
imageUrl
,
type
)
{
async
getIdCardInfo
(
imageUrl
,
type
)
{
type
=
type
||
1
;
type
=
type
||
1
;
var
ak
=
await
this
.
getAK
(
type
);
var
ak
=
await
this
.
getAK
(
type
);
if
(
!
ak
)
{
if
(
!
ak
)
{
return
;
return
;
}
}
var
url
=
"http://api.weixin.qq.com/cv/ocr/idcard?type=photo&img_url="
+
encodeURI
(
imageUrl
)
+
"&access_token="
+
ak
;
var
url
=
"http://api.weixin.qq.com/cv/ocr/idcard?type=photo&img_url="
+
encodeURI
(
imageUrl
)
+
"&access_token="
+
ak
;
try
{
try
{
var
rtn
=
await
this
.
rc
.
execGet
({},
url
);
var
rtn
=
await
this
.
rc
.
execGet
({},
url
);
console
.
log
(
rtn
);
console
.
log
(
rtn
);
...
@@ -116,10 +116,10 @@ class AppletBase {
...
@@ -116,10 +116,10 @@ class AppletBase {
async
getBankInfo
(
imageUrl
,
type
)
{
async
getBankInfo
(
imageUrl
,
type
)
{
type
=
type
||
1
;
type
=
type
||
1
;
var
ak
=
await
this
.
getAK
(
type
);
var
ak
=
await
this
.
getAK
(
type
);
if
(
!
ak
)
{
if
(
!
ak
)
{
return
;
return
;
}
}
var
url
=
"http://api.weixin.qq.com/cv/ocr/bankcard?img_url="
+
encodeURI
(
imageUrl
)
+
"&access_token="
+
ak
;
var
url
=
"http://api.weixin.qq.com/cv/ocr/bankcard?img_url="
+
encodeURI
(
imageUrl
)
+
"&access_token="
+
ak
;
try
{
try
{
var
rtn
=
await
this
.
rc
.
execGet
({},
url
);
var
rtn
=
await
this
.
rc
.
execGet
({},
url
);
console
.
log
(
rtn
);
console
.
log
(
rtn
);
...
@@ -199,30 +199,32 @@ class AppletBase {
...
@@ -199,30 +199,32 @@ class AppletBase {
}
}
}
}
trim
(
str
)
{
trim
(
o
)
{
return
str
?
str
.
trim
()
:
""
;
if
(
!
o
)
{
return
""
;
}
return
o
.
toString
().
trim
();
}
}
getUidStr
(
len
,
radix
)
{
getUidStr
(
len
,
radix
)
{
var
chars
=
'0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
.
split
(
''
);
var
chars
=
'0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
.
split
(
''
);
var
uuid
=
[],
var
uuid
=
[],
i
;
i
;
radix
=
radix
||
chars
.
length
;
radix
=
radix
||
chars
.
length
;
if
(
len
)
{
if
(
len
)
{
for
(
i
=
0
;
i
<
len
;
i
++
)
uuid
[
i
]
=
chars
[
0
|
Math
.
random
()
*
radix
];
for
(
i
=
0
;
i
<
len
;
i
++
)
uuid
[
i
]
=
chars
[
0
|
Math
.
random
()
*
radix
];
}
else
{
}
else
{
var
r
;
var
r
;
uuid
[
8
]
=
uuid
[
13
]
=
uuid
[
18
]
=
uuid
[
23
]
=
'-'
;
uuid
[
8
]
=
uuid
[
13
]
=
uuid
[
18
]
=
uuid
[
23
]
=
'-'
;
uuid
[
14
]
=
'4'
;
uuid
[
14
]
=
'4'
;
for
(
i
=
0
;
i
<
36
;
i
++
)
{
for
(
i
=
0
;
i
<
36
;
i
++
)
{
if
(
!
uuid
[
i
])
{
if
(
!
uuid
[
i
])
{
r
=
0
|
Math
.
random
()
*
16
;
r
=
0
|
Math
.
random
()
*
16
;
uuid
[
i
]
=
chars
[(
i
==
19
)
?
(
r
&
0x3
)
|
0x8
:
r
];
uuid
[
i
]
=
chars
[(
i
==
19
)
?
(
r
&
0x3
)
|
0x8
:
r
];
}
}
}
}
}
}
return
uuid
.
join
(
''
);
return
uuid
.
join
(
''
);
}
}
}
}
module
.
exports
=
AppletBase
;
module
.
exports
=
AppletBase
;
// var task=new AppletBase();
// var task=new AppletBase();
...
...
xgg-web/app/base/wxapplet/impl/chuangfuApplet.js
View file @
b289ea23
...
@@ -340,5 +340,130 @@ class ChuangfuApplet extends AppletBase {
...
@@ -340,5 +340,130 @@ class ChuangfuApplet extends AppletBase {
return
system
.
getResult
(
null
,
`系统错误 错误信息
${
error
}
`
);
return
system
.
getResult
(
null
,
`系统错误 错误信息
${
error
}
`
);
}
}
}
}
/**
* 查询为审核订单
* @param {*} gobj
* @param {*} pobj
* @param {*} req
* @param {*} loginUser
*/
async
unauditOrders
(
gobj
,
pobj
,
req
,
loginUser
)
{
if
(
!
loginUser
)
{
return
{
code
:
1
,
data
:{
count
:
0
,
rows
:[]}};
}
try
{
var
params
=
{
pageSize
:
pobj
.
pageSize
||
10
,
currentPage
:
pobj
.
currentPage
||
1
,
auditStatus
:
pobj
.
auditStatus
,
merchantId
:
this
.
merchantId
,
}
//0待审核 1审核通过
var
page
=
await
this
.
bmorderSve
.
unauditOrders
(
params
);
var
result
=
{
code
:
1
,
data
:
page
};
return
result
;
}
catch
(
e
)
{
console
.
log
(
e
.
stack
);
//日志记录
logCtl
.
error
({
optitle
:
"绑定手机, params ["
+
JSON
.
stringify
(
params
)
+
" ]"
,
op
:
"wxapplet/impl/xggApplet/myReqList"
,
content
:
e
.
stack
,
clientIp
:
req
.
clientIp
});
return
{
code
:
-
200
,
msg
:
"error"
,
data
:
{},
stack
:
e
.
stack
};
}
}
/**
* 审核
* @param {*} gobj
* @param {*} pobj
* @param {*} req
* @param {*} loginUser
*/
async
audit
(
gobj
,
pobj
,
req
,
loginUser
){
try
{
let
param
=
{
auditId
:
loginUser
.
id
,
rejectReason
:
this
.
trim
(
pobj
.
rejectReason
)
||
""
,
auditStatus
:
parseInt
(
pobj
.
auditStatus
),
id
:
this
.
trim
(
pobj
.
id
)
}
return
await
this
.
bmorderSve
.
audit
(
param
);
}
catch
(
error
)
{
console
.
log
(
error
);
return
system
.
getResult
(
null
,
error
);
}
}
/**
* 更新订单
* @param {*} gobj
* @param {*} pobj
* @param {*} req
* @param {*} loginUser
*/
async
updateOrder
(
gobj
,
pobj
,
req
,
loginUser
){
if
(
!
loginUser
){
return
system
.
getResult
(
null
,
`请先登陆`
);
}
try
{
//构建参数
var
order
=
{
auditStatus
:
pobj
.
auditStatus
,
id
:
this
.
trim
(
pobj
.
id
)
};
let
obj
=
pobj
;
var
userbiz
=
{
idcard_front
:
this
.
trim
(
obj
.
idcard_front
),
idcard_back
:
this
.
trim
(
obj
.
idcard_back
),
idcard
:
this
.
trim
(
obj
.
idcard
),
legal_name
:
this
.
trim
(
obj
.
legal_name
),
legal_mobile
:
this
.
trim
(
obj
.
legal_mobile
),
person_img
:
this
.
trim
(
obj
.
person_img
),
companyNames
:
this
.
trim
(
obj
.
companyNames
),
bank_front
:
this
.
trim
(
obj
.
bank_front
),
bank_back
:
this
.
trim
(
obj
.
bank_back
),
bank
:
this
.
trim
(
obj
.
bank
),
bankno
:
this
.
trim
(
obj
.
bankno
),
bankMobile
:
this
.
trim
(
obj
.
bankMobile
),
businessScope
:
this
.
trim
(
obj
.
businessScope
)
};
let
params
=
{
order
,
userbiz
,
loginUser
}
return
await
this
.
bmorderSve
.
updateOrder
(
params
);
}
catch
(
error
)
{
console
.
log
(
error
);
return
system
.
getResult
(
null
,
error
);
}
}
/**
* 查询订单明细
* @param {*} gobj
* @param {*} pobj
* @param {*} req
* @param {*} loginUser
*/
async
queryOrderInfo
(
gobj
,
pobj
,
req
,
loginUser
){
if
(
!
loginUser
){
return
system
.
getResult
(
null
,
`请先登陆`
);
}
try
{
return
await
this
.
bmorderSve
.
queryOrderInfo
(
pobj
);
}
catch
(
error
)
{
console
.
log
(
error
);
return
system
.
getResult
(
null
,
error
);
}
}
}
}
module
.
exports
=
ChuangfuApplet
;
module
.
exports
=
ChuangfuApplet
;
\ No newline at end of file
xgg-web/app/base/wxapplet/impl/xggApplet.js
View file @
b289ea23
...
@@ -22,6 +22,7 @@ class xggApplet extends AppletBase {
...
@@ -22,6 +22,7 @@ class xggApplet extends AppletBase {
this
.
uploadCtl
=
system
.
getObject
(
"web.uploadCtl"
);
this
.
uploadCtl
=
system
.
getObject
(
"web.uploadCtl"
);
this
.
idcardClient
=
system
.
getObject
(
"util.idcardClient"
);
this
.
idcardClient
=
system
.
getObject
(
"util.idcardClient"
);
this
.
merchantId
=
1
;
}
}
// 设置登录缓存
// 设置登录缓存
...
@@ -64,6 +65,7 @@ class xggApplet extends AppletBase {
...
@@ -64,6 +65,7 @@ class xggApplet extends AppletBase {
headurl
:
decryptData
.
avatarUrl
,
headurl
:
decryptData
.
avatarUrl
,
balance
:
0
,
balance
:
0
,
income
:
0
,
income
:
0
,
isAuditor
:
0
};
};
//创建用户信息
//创建用户信息
user
=
await
this
.
bmuserSve
.
create
(
user
);
user
=
await
this
.
bmuserSve
.
create
(
user
);
...
@@ -99,10 +101,12 @@ class xggApplet extends AppletBase {
...
@@ -99,10 +101,12 @@ class xggApplet extends AppletBase {
}
}
async
commonInfo
(
gobj
,
pobj
,
req
,
loginUser
)
{
async
commonInfo
(
gobj
,
pobj
,
req
,
loginUser
)
{
var
user
=
await
this
.
bmuserSve
.
findById
(
loginUser
.
id
);
return
{
return
{
code
:
1
,
code
:
1
,
data
:
{
data
:
{
telphone
:
"15210210265"
telphone
:
"15210210265"
,
isAuditor
:
user
.
isAuditor
}
}
};
};
}
}
...
@@ -215,16 +219,17 @@ class xggApplet extends AppletBase {
...
@@ -215,16 +219,17 @@ class xggApplet extends AppletBase {
var
orderNo
=
loginUser
.
id
+
""
+
moment
().
format
(
"YYYYMMDDHHmmss"
);
var
orderNo
=
loginUser
.
id
+
""
+
moment
().
format
(
"YYYYMMDDHHmmss"
);
var
order
=
{
var
order
=
{
merchantId
:
obj
.
merchantId
,
merchantId
:
obj
.
merchantId
||
this
.
merchantId
,
companyId
:
obj
.
companyId
,
companyId
:
obj
.
companyId
,
orderNo
:
orderNo
,
orderNo
:
orderNo
,
userId
:
loginUser
.
id
,
userId
:
loginUser
.
id
,
ownerId
:
0
,
ownerId
:
0
,
status
:
0
status
:
0
,
auditStatus
:
0
};
};
var
userbiz
=
{
var
userbiz
=
{
merchantId
:
obj
.
merchantId
,
merchantId
:
obj
.
merchantId
||
this
.
merchantId
,
companyId
:
obj
.
companyId
,
companyId
:
obj
.
companyId
,
orderNo
:
orderNo
,
orderNo
:
orderNo
,
user_id
:
loginUser
.
id
,
user_id
:
loginUser
.
id
,
...
@@ -285,6 +290,130 @@ class xggApplet extends AppletBase {
...
@@ -285,6 +290,130 @@ class xggApplet extends AppletBase {
console
.
log
(
decryptData
);
console
.
log
(
decryptData
);
}
}
/**
* 查询为审核订单
* @param {*} gobj
* @param {*} pobj
* @param {*} req
* @param {*} loginUser
*/
async
unauditOrders
(
gobj
,
pobj
,
req
,
loginUser
)
{
if
(
!
loginUser
)
{
return
{
code
:
1
,
data
:{
count
:
0
,
rows
:[]}};
}
try
{
var
params
=
{
pageSize
:
pobj
.
pageSize
||
10
,
currentPage
:
pobj
.
currentPage
||
1
,
auditStatus
:
pobj
.
auditStatus
,
merchantId
:
this
.
merchantId
,
}
//0待审核 1审核通过
var
page
=
await
this
.
bmorderSve
.
unauditOrders
(
params
);
var
result
=
{
code
:
1
,
data
:
page
};
return
result
;
}
catch
(
e
)
{
console
.
log
(
e
.
stack
);
//日志记录
logCtl
.
error
({
optitle
:
"绑定手机, params ["
+
JSON
.
stringify
(
params
)
+
" ]"
,
op
:
"wxapplet/impl/xggApplet/myReqList"
,
content
:
e
.
stack
,
clientIp
:
req
.
clientIp
});
return
{
code
:
-
200
,
msg
:
"error"
,
data
:
{},
stack
:
e
.
stack
};
}
}
/**
* 审核
* @param {*} gobj
* @param {*} pobj
* @param {*} req
* @param {*} loginUser
*/
async
audit
(
gobj
,
pobj
,
req
,
loginUser
){
try
{
let
param
=
{
auditId
:
loginUser
.
id
,
rejectReason
:
this
.
trim
(
pobj
.
rejectReason
)
||
""
,
auditStatus
:
parseInt
(
pobj
.
auditStatus
),
id
:
this
.
trim
(
pobj
.
id
)
}
return
await
this
.
bmorderSve
.
audit
(
param
);
}
catch
(
error
)
{
console
.
log
(
error
);
return
system
.
getResult
(
null
,
error
);
}
}
/**
* 更新订单
* @param {*} gobj
* @param {*} pobj
* @param {*} req
* @param {*} loginUser
*/
async
updateOrder
(
gobj
,
pobj
,
req
,
loginUser
){
if
(
!
loginUser
){
return
system
.
getResult
(
null
,
`请先登陆`
);
}
try
{
//构建参数
var
order
=
{
auditStatus
:
0
,
id
:
this
.
trim
(
pobj
.
id
)
};
let
obj
=
pobj
;
var
userbiz
=
{
idcard_front
:
this
.
trim
(
obj
.
idcard_front
),
idcard_back
:
this
.
trim
(
obj
.
idcard_back
),
idcard
:
this
.
trim
(
obj
.
idcard
),
legal_name
:
this
.
trim
(
obj
.
legal_name
),
legal_mobile
:
this
.
trim
(
obj
.
legal_mobile
),
person_img
:
this
.
trim
(
obj
.
person_img
),
companyNames
:
this
.
trim
(
obj
.
companyNames
),
bank_front
:
this
.
trim
(
obj
.
bank_front
),
bank_back
:
this
.
trim
(
obj
.
bank_back
),
bank
:
this
.
trim
(
obj
.
bank
),
bankno
:
this
.
trim
(
obj
.
bankno
),
bankMobile
:
this
.
trim
(
obj
.
bankMobile
)
};
let
params
=
{
order
,
userbiz
,
loginUser
}
return
await
this
.
bmorderSve
.
updateOrder
(
params
);
}
catch
(
error
)
{
console
.
log
(
error
);
return
system
.
getResult
(
null
,
error
);
}
}
/**
* 查询订单明细
* @param {*} gobj
* @param {*} pobj
* @param {*} req
* @param {*} loginUser
*/
async
queryOrderInfo
(
gobj
,
pobj
,
req
,
loginUser
){
if
(
!
loginUser
){
return
system
.
getResult
(
null
,
`请先登陆`
);
}
try
{
return
await
this
.
bmorderSve
.
queryOrderInfo
(
pobj
);
}
catch
(
error
)
{
console
.
log
(
error
);
return
system
.
getResult
(
null
,
error
);
}
}
async
idcardValid
(
gobj
,
pobj
,
req
,
loginUser
){
async
idcardValid
(
gobj
,
pobj
,
req
,
loginUser
){
try
{
try
{
var
idcard
=
(
pobj
.
idcard
||
""
).
trim
();
var
idcard
=
(
pobj
.
idcard
||
""
).
trim
();
...
...
xgg-web/恒昌api.txt
View file @
b289ea23
...
@@ -151,4 +151,169 @@
...
@@ -151,4 +151,169 @@
"data": {
"data": {
"telphone": "客服电话"
"telphone": "客服电话"
}
}
}
7. 查询未审核订单
登录要求:是
请求地址:applet/xggApplet/unauditOrders
请求类型:POST
请求参数:
{
"pageSize":10,
"currentPage":1,
"auditStatus":1 //审核状态 0 未审核 1审核成功
}
返回结果:
{
"code": 1,
"data": {
"count": 1,
"rows": [
{
"id": 1,
"merchantId": 1,
"companyId": 1,
"userId": 5,
"orderNo": "520190819112735",
"status": 0,
"auditStatus": 1,
"auditId": 0,
"rejectReason": "0",
"ownerId": 0,
"created_at": "2019-08-19 03:27",
"updated_at": "2019-08-19 03:27",
"userbiz": {
"id": 1,
"merchantId": 1,
"companyId": 1,
"orderId": 1,
"orderNo": "520190819112735",
"user_id": 5,
"idcard_front": "22222",
"idcard_back": "333333",
"idcard": "身份证",
"legal_name": "宋毅 ",
"legal_mobile": "3311333",
"person_img": "555555555",
"companyNames": "我我我###我我我我我",
"bank_front": "sllqlqlq",
"bank_back": "2ergerer",
"bank": "",
"bankno": "",
"bankaddr": "",
"bankMobile": "",
"businessScope": "",
"taxNo": "",
"created_at": "2019-08-19T03:27:35.000Z",
"updated_at": "2019-08-19T03:27:35.000Z",
"deleted_at": null,
"version": 0
},
"statusName": "信息提交"
}
]
}
}
8. 审核
登录要求:是
请求地址:applet/xggApplet/audit
请求类型:POST
请求参数:
{
"rejectReason":"", //驳回原因
"auditStatus":1, //审核状态 0待审核 1审核通过 2审核驳回
"id":1 //订单ID
}
返回结果:
{
"code": 1,
"msg": "success"
}
9.查询明细
登录要求:是
请求地址:/applet/xggApplet/queryOrderInfo
请求类型:POST
请求参数:
{
"id":1 //订单ID
}
返回结果:
{
"code": 1,
"msg": "success",
"orderInfo": {
"id": 1,
"merchantId": 1,
"companyId": 1,
"userId": 5,
"orderNo": "520190819112735",
"status": 0,
"ownerId": 0,
"auditStatus": 1,
"auditId": 1,
"rejectReason": "",
"created_at": "2019-08-19T03:27:35.000Z",
"updated_at": "2019-12-26T09:39:52.000Z",
"deleted_at": null,
"version": 0,
"child": {
"id": 1,
"merchantId": 1,
"companyId": 1,
"orderId": 1,
"orderNo": "520190819112735",
"user_id": 5,
"taxNo": "",
"idcard_front": "22222",
"idcard_back": "333333",
"idcard": "身份证",
"bank_front": "sllqlqlq",
"bank_back": "2ergerer",
"bank": "",
"bankno": "",
"bankaddr": "",
"bankMobile": "",
"person_img": "555555555",
"legal_name": "宋毅 ",
"legal_mobile": "3311333",
"companyNames": "我我我###我我我我我",
"businessScope": "",
"created_at": "2019-08-19T03:27:35.000Z",
"updated_at": "2019-08-19T03:27:35.000Z",
"deleted_at": null,
"version": 0
}
}
}
10.更新订单
登录要求:是
请求地址:/applet/xggApplet/updateOrder
请求类型:POST
请求参数:
{
"auditStatus":0,
"id":1,
"idcard_front":"96969696",
"idcard_back":"9696969",
"idcard":"969696969",
"legal_name": "969*69696",
"legal_mobile":"99999966969",
"person_img": "969696969",
"companyNames":"969696969",
"bank_front": "96969696969",
"bank_back":"9696969696",
"bank":"9696969",
"bankno":"96969696969",
"bankMobile":"986696969"
}
返回结果:
{
"code": 1,
"msg": "success"
}
}
\ No newline at end of file
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