Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform
Project
Project
Details
Activity
Releases
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
youjj
cloud-platform
Commits
78557bcc
Commit
78557bcc
authored
Jan 09, 2020
by
hanfeng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
开票
parent
019e2e45
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
5 deletions
+4
-5
InvoiceController.java
...xxfc/platform/universal/controller/InvoiceController.java
+1
-1
InvoiceBiz.java
.../java/com/xxfc/platform/universal/service/InvoiceBiz.java
+3
-4
No files found.
xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/controller/InvoiceController.java
View file @
78557bcc
...
@@ -86,7 +86,7 @@ public class InvoiceController extends BaseController<InvoiceBiz, Invoice> {
...
@@ -86,7 +86,7 @@ public class InvoiceController extends BaseController<InvoiceBiz, Invoice> {
// invoiceVo.setCreateBy(infoFromToken.getName());
// invoiceVo.setCreateBy(infoFromToken.getName());
try
{
try
{
String
invoicing
=
baseBiz
.
Invoicing
(
invoiceVo
,
request
);
String
invoicing
=
baseBiz
.
Invoicing
(
invoiceVo
);
return
ObjectRestResponse
.
succ
(
invoicing
);
return
ObjectRestResponse
.
succ
(
invoicing
);
}
catch
(
BaseException
e
)
{
}
catch
(
BaseException
e
)
{
log
.
error
(
"开票错误信息={}"
,
e
);
log
.
error
(
"开票错误信息={}"
,
e
);
...
...
xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/InvoiceBiz.java
View file @
78557bcc
...
@@ -107,11 +107,10 @@ public class InvoiceBiz extends BaseBiz<InvoiceMapper, Invoice> {
...
@@ -107,11 +107,10 @@ public class InvoiceBiz extends BaseBiz<InvoiceMapper, Invoice> {
* 开票
* 开票
*
*
* @param invoiceVo
* @param invoiceVo
* @param request
* @return
* @return
* @throws Exception
* @throws Exception
*/
*/
public
String
Invoicing
(
InvoiceVo
invoiceVo
,
HttpServletRequest
request
)
throws
Exception
{
public
String
Invoicing
(
InvoiceVo
invoiceVo
)
throws
Exception
{
//没有填写邮箱不需要进行推送
//没有填写邮箱不需要进行推送
if
(
StringUtils
.
isBlank
(
invoiceVo
.
getPurchaserEmail
()))
{
if
(
StringUtils
.
isBlank
(
invoiceVo
.
getPurchaserEmail
()))
{
pushMode
=
-
1
;
pushMode
=
-
1
;
...
@@ -140,7 +139,7 @@ public class InvoiceBiz extends BaseBiz<InvoiceMapper, Invoice> {
...
@@ -140,7 +139,7 @@ public class InvoiceBiz extends BaseBiz<InvoiceMapper, Invoice> {
//调用第三方开票
//调用第三方开票
String
invoiceSerialNum
=
invoiceDao
.
Invoicing
(
invoice
,
orders
);
String
invoiceSerialNum
=
invoiceDao
.
Invoicing
(
invoice
,
orders
);
insertInvoic
(
invoice
,
invoiceSerialNum
,
orders
,
request
);
insertInvoic
(
invoice
,
invoiceSerialNum
,
orders
);
return
invoiceSerialNum
;
return
invoiceSerialNum
;
}
}
...
@@ -152,7 +151,7 @@ public class InvoiceBiz extends BaseBiz<InvoiceMapper, Invoice> {
...
@@ -152,7 +151,7 @@ public class InvoiceBiz extends BaseBiz<InvoiceMapper, Invoice> {
* @param orders
* @param orders
* @throws Exception
* @throws Exception
*/
*/
public
void
insertInvoic
(
Invoice
invoice
,
String
invoiceSerialNum
,
List
<
OrderData
>
orders
,
HttpServletRequest
request
)
throws
Exception
{
public
void
insertInvoic
(
Invoice
invoice
,
String
invoiceSerialNum
,
List
<
OrderData
>
orders
)
throws
Exception
{
invoice
.
setInvoiceSerialNum
(
invoiceSerialNum
);
invoice
.
setInvoiceSerialNum
(
invoiceSerialNum
);
BigDecimal
taxExcludedAmount
=
BigDecimal
.
ZERO
;
BigDecimal
taxExcludedAmount
=
BigDecimal
.
ZERO
;
...
...
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