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
5668dd80
Commit
5668dd80
authored
Apr 21, 2020
by
王昆
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'bpo-web' of gitlab.gongsibao.com:jiangyong/zhichan into bpo-web
parents
a9e7f1ac
111f3e36
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
45 additions
and
0 deletions
+45
-0
bpo-web/app/base/service/impl/entcontractSve.js
+45
-0
No files found.
bpo-web/app/base/service/impl/entcontractSve.js
View file @
5668dd80
...
...
@@ -562,6 +562,8 @@ class EntcontractService extends ServiceBase {
ecid
:
10287
};
try
{
erchants
=
await
this
.
yzmerchantsignedDao
.
create
(
erchants
);
}
catch
(
e
)
{
console
.
log
(
"c_yzmerchant_signed插入失败"
,
erchants
);
...
...
@@ -582,6 +584,49 @@ class EntcontractService extends ServiceBase {
}
reso
.
erchants
=
erchants
;
reso
.
data
.
ecid
=
10287
;
//----------------
let
ecompany
=
await
this
.
ecompanyDao
.
findOne
({
"name"
:
params
.
merchantName
,
})
if
(
!
ecompany
)
{
// 创建ecompany
ecompany
=
await
this
.
ecompanyDao
.
create
({
"name"
:
params
.
merchantName
,
"nameA"
:
''
,
"isEnabled"
:
true
,
"isQuiet"
:
true
,
"sealurl"
:
""
,
"encryptkey"
:
""
,
"posturl"
:
""
});
}
let
busi
=
await
this
.
ecompanybusiDao
.
findOne
({
ecompany_id
:
ecompany
.
id
,
etemplate_id
:
10287
,
});
if
(
!
busi
)
{
await
this
.
ecompanybusiDao
.
create
({
ecompany_id
:
ecompany
.
id
,
etemplate_id
:
10287
,
postwxurl
:
""
,
postsignurl
:
""
,
appId
:
reso
.
data
.
appId
,
mchtId
:
reso
.
data
.
mchtId
,
mainId
:
reso
.
data
.
mainId
,
key
:
reso
.
data
.
secret
,
});
}
else
{
busi
.
appId
=
reso
.
data
.
appId
;
busi
.
mchtId
=
reso
.
data
.
mchtId
;
busi
.
mainId
=
reso
.
data
.
mainId
;
busi
.
key
=
reso
.
data
.
secret
;
await
busi
.
save
();
}
//----------------
return
reso
;
}
catch
(
e
)
{
console
.
log
(
e
.
stack
);
...
...
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