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
39d502fa
Commit
39d502fa
authored
Apr 21, 2020
by
孙亚楠
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dd
parent
66820ffb
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
1 deletions
+11
-1
xgg-saas-merchant/app/base/controller/impl/saas/invoiceCtl.js
+11
-1
No files found.
xgg-saas-merchant/app/base/controller/impl/saas/invoiceCtl.js
View file @
39d502fa
...
...
@@ -184,15 +184,20 @@ class InvoiceCtl extends CtlBase {
let
orders
=
await
this
.
orderSve
.
byIds
({
ids
:
params
.
data_ids
,
saas_merchant_id
:
params
.
saas_merchant_id
,
attrs
:
"id"
,
attrs
:
"id
,price
"
,
handle_status
:
[
'20'
,
'30'
],
unInvoice
:
true
,
})
||
[];
if
(
orders
.
data
.
length
!=
params
.
data_ids
.
length
)
{
return
system
.
getResult
(
null
,
"订单数据选择有误,请重新搜索后选择"
);
}
let
invoice_amount
=
0
;
for
(
let
item
of
orders
.
data
){
invoice_amount
=
invoice_amount
+
Number
(
item
.
price
||
0
);
}
let
info
=
await
this
.
merchantSve
.
signInfo
({
id
:
params
.
saas_merchant_id
})
||
{};
// service_tax
info
=
info
.
data
||
{};
if
(
!
info
.
main
)
{
return
system
.
getResult
(
null
,
"商户未设置转账交易主体,请联系平台进行设置、"
);
...
...
@@ -200,6 +205,7 @@ class InvoiceCtl extends CtlBase {
let
main
=
info
.
main
||
{};
let
batch_no
=
await
this
.
redisClient
.
genrateId
(
"invoice_batch_no"
);
let
apply_no
=
batch_no
;
let
service_tax
=
parseFloat
((
Number
(
invoice_amount
)
*
Number
(
info
.
invoice_service_rate
)
/
100
).
toFixed
(
2
));
let
data
=
{
saas_id
:
params
.
saas_id
,
saas_merchant_id
:
params
.
saas_merchant_id
,
...
...
@@ -228,6 +234,10 @@ class InvoiceCtl extends CtlBase {
mail_addr
:
this
.
trim
(
addr
.
mail_addr
),
mail_mobile
:
this
.
trim
(
addr
.
mail_mobile
),
mail_to
:
this
.
trim
(
addr
.
mail_to
),
invoice_amount
:
invoice_amount
,
service_tax
:
service_tax
,
};
data
=
await
this
.
invoiceSve
.
applySave
(
data
);
...
...
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