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
6f19332c
Commit
6f19332c
authored
May 09, 2020
by
孙亚楠
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ddg
parent
9b76c01d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
3 deletions
+7
-3
xgg-saas-platform/app/base/controller/impl/saas/invoiceCtl.js
+1
-1
xgg-saas-platform/app/base/service/impl/saas/saasinvoiceSve.js
+5
-1
xgg-saas-platform/app/base/system.js
+1
-1
No files found.
xgg-saas-platform/app/base/controller/impl/saas/invoiceCtl.js
View file @
6f19332c
...
...
@@ -306,7 +306,7 @@ class InvoiceCtl extends CtlBase {
mail_addr
:
this
.
trim
(
params
.
mail_addr
),
mail_mobile
:
this
.
trim
(
params
.
mail_mobile
),
mail_to
:
this
.
trim
(
params
.
mail_to
),
data_ids
:
this
.
trim
(
params
.
data_ids
),
// TODO 总统测试
data_ids
:
this
.
trim
(
invoice
.
data_ids
),
// TODO 总统测试
personal_invoice_tax
:
system
.
y2f
(
invoice
.
personal_invoice_tax
),
additional_tax
:
system
.
y2f
(
invoice
.
additional_tax
),
...
...
xgg-saas-platform/app/base/service/impl/saas/saasinvoiceSve.js
View file @
6f19332c
...
...
@@ -194,9 +194,13 @@ class SaasinvoiceService extends ServiceBase {
if
(
saasInvoiceApply
.
fee_type
==
"00"
)
{
//个体户注册订单
tradOrder
=
[];
}
else
{
//查询流水
if
(
saasInvoiceApply
.
data_ids
){
saasInvoiceApply
.
data_ids
=
saasInvoiceApply
.
data_ids
.
split
(
','
);
}
let
tradOrderRes
=
await
this
.
callms
(
"trade"
,
"invoiceTrade"
,
{
id
:
saasInvoiceApply
.
id
,
order_type
:
saasInvoiceApply
.
fee_type
order_type
:
saasInvoiceApply
.
fee_type
,
data_ids
:
saasInvoiceApply
.
data_ids
||
[]
})
||
{};
if
(
tradOrderRes
.
status
==
0
)
{
tradOrder
=
tradOrderRes
.
data
;
...
...
xgg-saas-platform/app/base/system.js
View file @
6f19332c
...
...
@@ -200,7 +200,7 @@ class System {
order
:
dev
+
":3103"
+
path
,
// 发票服务
invoice
:
dev
+
":3105"
+
path
,
invoice
:
local
+
":3105"
+
path
,
// 用户服务
uc
:
dev
+
":3106"
+
path
,
...
...
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