Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
order-group
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
order-group-application
order-group
Commits
b7bebd44
Commit
b7bebd44
authored
Sep 18, 2021
by
陈斌
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
5eb17a1c
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
3 deletions
+18
-3
order-application-service/src/main/java/cn/freemud/controller/OrderController.java
+2
-1
order-application-service/src/main/java/cn/freemud/entities/dto/order/InvoiceCreateResponseVo.java
+12
-0
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+4
-2
No files found.
order-application-service/src/main/java/cn/freemud/controller/OrderController.java
View file @
b7bebd44
...
...
@@ -14,6 +14,7 @@ package cn.freemud.controller;
import
cn.freemud.annotations.IsConvertEN
;
import
cn.freemud.base.entity.BaseResponse
;
import
cn.freemud.entities.dto.order.InvoiceCreateResponseVo
;
import
cn.freemud.entities.vo.*
;
import
cn.freemud.entities.vo.encircle.CreateReserveOrderVo
;
import
cn.freemud.entities.vo.encircle.EncircleReserveBaseVo
;
...
...
@@ -454,7 +455,7 @@ public class OrderController {
*/
@ApiAnnotation
(
logMessage
=
"createOrderInvoice"
)
@PostMapping
(
"/createOrderInvoice"
)
public
BaseResponse
createOrderInvoice
(
@Validated
@LogParams
@RequestBody
CreateOrderInvoiceRequest
request
)
{
public
BaseResponse
<
InvoiceCreateResponseVo
>
createOrderInvoice
(
@Validated
@LogParams
@RequestBody
CreateOrderInvoiceRequest
request
)
{
return
orderservice
.
createAndGetOrderInvoice
(
request
);
}
...
...
order-application-service/src/main/java/cn/freemud/entities/dto/order/InvoiceCreateResponseVo.java
0 → 100644
View file @
b7bebd44
package
cn
.
freemud
.
entities
.
dto
.
order
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
@Data
public
class
InvoiceCreateResponseVo
{
@ApiModelProperty
(
value
=
"扫码开票url地址"
)
private
String
scanUrl
;
}
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
View file @
b7bebd44
...
...
@@ -4373,7 +4373,7 @@ public class OrderServiceImpl implements Orderservice {
}
@Override
public
BaseResponse
createAndGetOrderInvoice
(
CreateOrderInvoiceRequest
request
){
public
BaseResponse
<
InvoiceCreateResponseVo
>
createAndGetOrderInvoice
(
CreateOrderInvoiceRequest
request
){
AssortmentCustomerInfoVo
userLoginInfoDto
=
customerInfoManager
.
getCustomerInfoByObject
(
request
.
getSessionId
());
if
(
userLoginInfoDto
==
null
||
StringUtils
.
isEmpty
(
userLoginInfoDto
.
getMemberId
()))
{
return
ResponseUtil
.
error
(
ResponseResult
.
NOT_LOGIN
);
...
...
@@ -4410,7 +4410,9 @@ public class OrderServiceImpl implements Orderservice {
return
orderInvoiceResponse
;
}
return
ResponseUtil
.
success
();
InvoiceCreateResponseVo
responseVo
=
new
InvoiceCreateResponseVo
();
responseVo
.
setScanUrl
(
invoiceResponse
.
getData
().
getScanUrl
());
return
ResponseUtil
.
success
(
responseVo
);
}
...
...
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