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
5dc9ca90
Commit
5dc9ca90
authored
May 12, 2020
by
孙亚楠
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gtb
parent
1cc03026
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
5 deletions
+21
-5
xgg-saas-merchant/app/base/system.js
+1
-1
xgg-saas-merchant/app/base/wxapplet/impl/merchantApplet.js
+20
-4
No files found.
xgg-saas-merchant/app/base/system.js
View file @
5dc9ca90
...
...
@@ -197,7 +197,7 @@ class System {
order
:
dev
+
":3103"
+
path
,
// 发票服务
invoice
:
local
+
":3105"
+
path
,
invoice
:
dev
+
":3105"
+
path
,
// 用户服务
uc
:
dev
+
":3106"
+
path
,
...
...
xgg-saas-merchant/app/base/wxapplet/impl/merchantApplet.js
View file @
5dc9ca90
...
...
@@ -271,7 +271,12 @@ class MerchantApplet extends AppletBase {
async
saasorderbusinessmenPage
(
params
,
pobj2
,
req
){
let
loginUser
=
await
this
.
getLoginUser
(
pobj2
.
merchant_id
,
pobj2
.
openid
);
pobj2
.
merchant_app_user_id
=
loginUser
.
id
;
return
await
this
.
businessmenSve
.
saasorderbusinessmenPage
(
pobj2
);
let
res
=
await
this
.
businessmenSve
.
saasorderbusinessmenPage
(
pobj2
);
if
(
res
.
status
==
0
){
return
this
.
returnSuccess
(
res
.
data
);
}
else
{
this
.
returnFail
(
"请求超时 请稍后在试"
);
}
}
/**
...
...
@@ -301,10 +306,15 @@ class MerchantApplet extends AppletBase {
return
sys
.
getResult
([]);
}
pobj2
.
credit_code_array
=
creditCodes
;
return
await
this
.
tradeSve
.
tradeItemBycreditCode
(
pobj2
);
let
res
=
await
this
.
tradeSve
.
tradeItemBycreditCode
(
pobj2
);
if
(
res
.
status
==
0
){
return
this
.
returnSuccess
(
res
.
data
);
}
else
{
this
.
returnFail
(
"请求超时 请稍后在试"
);
}
}
catch
(
e
)
{
console
.
log
(
e
);
return
system
.
getResult
(
null
,
`系统错误`
);
this
.
returnFail
(
"请求超时 请稍后在试"
);
}
}
...
...
@@ -335,7 +345,13 @@ class MerchantApplet extends AppletBase {
return
sys
.
getResult
([]);
}
pobj2
.
credit_code_array
=
creditCodes
;
return
await
this
.
saasInvoiceSve
.
invoiceBycreditCode
(
pobj2
);
let
res
=
await
this
.
saasInvoiceSve
.
invoiceBycreditCode
(
pobj2
);
if
(
res
.
status
==
0
){
return
this
.
returnSuccess
(
res
.
data
);
}
else
{
this
.
returnFail
(
"请求超时 请稍后在试"
);
}
}
catch
(
e
)
{
console
.
log
(
e
);
return
system
.
getResult
(
null
,
`系统错误`
);
...
...
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