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
c1eb8204
Commit
c1eb8204
authored
Apr 12, 2020
by
王昆
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'xgg-saas-platform' of gitlab.gongsibao.com:jiangyong/zhichan into xgg-saas-platform
parents
a13d2dae
de74d45e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
xgg-saas-platform/app/base/api/impl/inner/notifyApi.js
+2
-1
xgg-saas-platform/app/base/system.js
+2
-2
No files found.
xgg-saas-platform/app/base/api/impl/inner/notifyApi.js
View file @
c1eb8204
...
...
@@ -20,7 +20,8 @@ class TestAPI extends APIBase {
// 客户交付交付订单状态是1190时的推送信息
return
await
this
.
orderSve
.
sveDeliver
(
data
);
}
else
if
(
pobj
.
status
==
"1000000"
||
"2000000"
)
{
//建账信息
return
await
this
.
orderSve
.
sveBusinessmen
(
pobj
);
let
res
=
await
this
.
orderSve
.
sveBusinessmen
(
pobj
);
return
res
;
}
return
pobj
;
}
...
...
xgg-saas-platform/app/base/system.js
View file @
c1eb8204
...
...
@@ -197,7 +197,7 @@ class System {
merchant
:
dev
+
":3101"
+
path
,
// 订单服务
order
:
dev
+
":3103"
+
path
,
order
:
local
+
":3103"
+
path
,
// 发票服务
invoice
:
local
+
":3105"
+
path
,
...
...
@@ -206,7 +206,7 @@ class System {
uc
:
dev
+
":3106"
+
path
,
// 交易
trade
:
local
+
":3107"
+
path
,
trade
:
dev
+
":3107"
+
path
,
}
}
else
{
return
{
...
...
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