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
243abca9
Commit
243abca9
authored
Jan 09, 2020
by
hanfeng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
开票
parent
7f9a6c77
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
6 deletions
+11
-6
InvoiceController.java
...xxfc/platform/universal/controller/InvoiceController.java
+6
-2
InvoiceBiz.java
.../java/com/xxfc/platform/universal/service/InvoiceBiz.java
+4
-4
InvoiceDaoImpl.java
...atform/universal/service/invoice/impl/InvoiceDaoImpl.java
+1
-0
No files found.
xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/controller/InvoiceController.java
View file @
243abca9
...
...
@@ -8,8 +8,10 @@ import com.xxfc.platform.universal.entity.Invoice;
import
com.xxfc.platform.universal.entity.vo.InvoiceVo
;
import
com.xxfc.platform.universal.service.InvoiceBiz
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.*
;
import
javax.servlet.http.HttpServletRequest
;
import
java.util.List
;
import
java.util.Map
;
...
...
@@ -24,6 +26,8 @@ import java.util.Map;
@RequestMapping
(
"/invoice"
)
@Slf4j
public
class
InvoiceController
extends
BaseController
<
InvoiceBiz
,
Invoice
>
{
@Autowired
private
HttpServletRequest
request
;
/**
...
...
@@ -71,9 +75,9 @@ public class InvoiceController extends BaseController<InvoiceBiz, Invoice> {
*/
@PostMapping
(
"/invoicing"
)
public
ObjectRestResponse
invoicing
(
@RequestBody
InvoiceVo
invoiceVo
)
{
log
.
info
(
"开票信息={}"
,
invoiceVo
);
log
.
info
(
"开票信息={}"
,
invoiceVo
);
try
{
String
invoicing
=
baseBiz
.
Invoicing
(
invoiceVo
);
String
invoicing
=
baseBiz
.
Invoicing
(
invoiceVo
,
request
);
return
ObjectRestResponse
.
succ
(
invoicing
);
}
catch
(
BaseException
e
)
{
log
.
error
(
"开票错误信息={}"
,
e
);
...
...
xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/InvoiceBiz.java
View file @
243abca9
...
...
@@ -45,7 +45,6 @@ public class InvoiceBiz extends BaseBiz<InvoiceMapper, Invoice> {
private
final
InvoiceDao
invoiceDao
;
private
final
UserAuthConfig
userAuthConfig
;
private
final
HttpServletRequest
request
;
private
final
UserAuthUtil
userAuthUtil
;
private
final
InvoiceQueryErrorBiz
invoiceQueryErrorBiz
;
private
final
OrderFeign
orderFeign
;
...
...
@@ -109,10 +108,11 @@ public class InvoiceBiz extends BaseBiz<InvoiceMapper, Invoice> {
* 开票
*
* @param invoiceVo
* @param request
* @return
* @throws Exception
*/
public
String
Invoicing
(
InvoiceVo
invoiceVo
)
throws
Exception
{
public
String
Invoicing
(
InvoiceVo
invoiceVo
,
HttpServletRequest
request
)
throws
Exception
{
//没有填写邮箱不需要进行推送
if
(
StringUtils
.
isBlank
(
invoiceVo
.
getPurchaserEmail
()))
{
pushMode
=
-
1
;
...
...
@@ -141,7 +141,7 @@ public class InvoiceBiz extends BaseBiz<InvoiceMapper, Invoice> {
//调用第三方开票
String
invoiceSerialNum
=
invoiceDao
.
Invoicing
(
invoice
,
orders
);
insertInvoic
(
invoice
,
invoiceSerialNum
,
orders
);
insertInvoic
(
invoice
,
invoiceSerialNum
,
orders
,
request
);
return
invoiceSerialNum
;
}
...
...
@@ -153,7 +153,7 @@ public class InvoiceBiz extends BaseBiz<InvoiceMapper, Invoice> {
* @param orders
* @throws Exception
*/
public
void
insertInvoic
(
Invoice
invoice
,
String
invoiceSerialNum
,
List
<
OrderData
>
orders
)
throws
Exception
{
public
void
insertInvoic
(
Invoice
invoice
,
String
invoiceSerialNum
,
List
<
OrderData
>
orders
,
HttpServletRequest
request
)
throws
Exception
{
IJWTInfo
infoFromToken
=
userAuthUtil
.
getInfoFromToken
(
userAuthConfig
.
getToken
(
request
));
invoice
.
setUserId
(
Integer
.
valueOf
(
infoFromToken
.
getId
()));
...
...
xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/invoice/impl/InvoiceDaoImpl.java
View file @
243abca9
...
...
@@ -188,6 +188,7 @@ public class InvoiceDaoImpl implements InvoiceDao {
String
jsonString
=
JSON
.
toJSONString
(
orderMap
);
//调用第三方接口
String
result
=
sdk
.
sendPostSyncRequest
(
invoiceUrl
,
senid
,
appKey2
,
appSecret2
,
token
,
taxnum2
,
method
,
jsonString
);
log
.
info
(
"第三方响应信息={}"
,
result
);
//把字符串json数据转换为map
try
{
JSONObject
jsonObject
=
JSON
.
parseObject
(
result
);
...
...
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