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
d9e48f75
Commit
d9e48f75
authored
Jan 15, 2021
by
徐康
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加是否买券订单字段
parent
7e5bea14
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
0 deletions
+10
-0
order-application-service/src/main/java/cn/freemud/entities/vo/QueryOrderResponseVo.java
+5
-0
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+5
-0
No files found.
order-application-service/src/main/java/cn/freemud/entities/vo/QueryOrderResponseVo.java
View file @
d9e48f75
...
...
@@ -534,5 +534,10 @@ public class QueryOrderResponseVo {
*/
private
PayGiftCheckAndJoinResponseDto
payGiftReps
;
/**
* 是否买券订单 麦咖啡使用
*/
private
Integer
isCouponOrder
;
}
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
View file @
d9e48f75
...
...
@@ -91,6 +91,7 @@ import com.freemud.application.sdk.api.ordercenter.entities.PayItem;
import
com.freemud.application.sdk.api.ordercenter.enums.AfterSalesType
;
import
com.freemud.application.sdk.api.ordercenter.enums.OrderClientType
;
import
com.freemud.application.sdk.api.ordercenter.enums.PayChannelType
;
import
com.freemud.application.sdk.api.ordercenter.enums.ProductTypeEnum
;
import
com.freemud.application.sdk.api.ordercenter.request.OrderConditionsReq
;
import
com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto
;
import
com.freemud.application.sdk.api.ordercenter.request.OrderExtendedReq
;
...
...
@@ -1580,6 +1581,10 @@ public class OrderServiceImpl implements Orderservice {
queryOrderResponseVo
.
setOrderTypeDesc
(
Optional
.
ofNullable
(
McCafeOrderTypeGather
.
getByCode
(
queryOrderResponseVo
.
getOrderType
()))
.
map
(
McCafeOrderTypeGather:
:
getDesc
).
orElse
(
""
));
queryOrderResponseVo
.
setIsCouponOrder
(
queryOrderResponseVo
.
getProducts
().
stream
()
.
filter
(
o
->
!
ProductTypeEnum
.
VIRTUAL_PRODUCT
.
getCode
().
equals
(
o
.
getProductType
())
&&
!
ProductTypeEnum
.
WITH_ORDER_VIRTUAL_PRODUCT
.
getCode
().
equals
(
o
.
getProductType
())).
findAny
().
isPresent
()?
0
:
1
);
//48小时自动退款描述
if
(
storeInfo
!=
null
&&
storeInfo
.
getBizVO
()
!=
null
&&
storeInfo
.
getBizVO
().
getStoreConfig
()
!=
null
&&
queryOrderResponseVo
.
getRefundStatus
()
!=
null
&&
queryOrderResponseVo
.
getRefundStatus
()
==
1
)
{
...
...
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