记得上下班打卡 | git大法好,push需谨慎
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liquidnet-bus-v1
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
董敬伟
liquidnet-bus-v1
Commits
8c3b9e88
Commit
8c3b9e88
authored
Aug 30, 2021
by
胡佳晨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加 订单 优惠券
parent
48a045a6
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
1 deletion
+18
-1
OrderDetailsVo.java
...iquidnet/service/kylin/dto/vo/returns/OrderDetailsVo.java
+4
-1
KylinOrderTicketsServiceImpl.java
...vice/kylin/service/impl/KylinOrderTicketsServiceImpl.java
+2
-0
DataUtils.java
...ain/java/com/liquidnet/service/kylin/utils/DataUtils.java
+12
-0
No files found.
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/OrderDetailsVo.java
View file @
8c3b9e88
...
@@ -2,20 +2,23 @@ package com.liquidnet.service.kylin.dto.vo.returns;
...
@@ -2,20 +2,23 @@ package com.liquidnet.service.kylin.dto.vo.returns;
import
com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo
;
import
com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo
;
import
com.liquidnet.service.kylin.entity.KylinFields
;
import
com.liquidnet.service.kylin.entity.KylinFields
;
import
com.liquidnet.service.kylin.entity.KylinOrderCoupons
;
import
lombok.Data
;
import
lombok.Data
;
import
java.util.List
;
import
java.util.List
;
@Data
@Data
public
class
OrderDetailsVo
implements
Cloneable
{
public
class
OrderDetailsVo
implements
Cloneable
{
private
KylinOrderTicketVo
orderTicketVo
;
private
KylinOrderTicketVo
orderTicketVo
;
private
String
enterDescribe
;
private
String
enterDescribe
;
private
Integer
expressStatus
;
private
Integer
expressStatus
;
private
Long
restTime
;
private
Long
restTime
;
private
Integer
isCanRefund
;
private
Integer
isCanRefund
;
private
List
<
KylinOrderRefundsOrderCodeVo
>
orderRefundsVoList
;
private
List
<
KylinOrderRefundsOrderCodeVo
>
orderRefundsVoList
;
private
List
<
KylinOrderCoupons
>
orderCouponsList
;
private
static
final
OrderDetailsVo
obj
=
new
OrderDetailsVo
();
private
static
final
OrderDetailsVo
obj
=
new
OrderDetailsVo
();
public
static
OrderDetailsVo
getNew
()
{
public
static
OrderDetailsVo
getNew
()
{
try
{
try
{
return
(
OrderDetailsVo
)
obj
.
clone
();
return
(
OrderDetailsVo
)
obj
.
clone
();
...
...
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java
View file @
8c3b9e88
...
@@ -236,6 +236,8 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
...
@@ -236,6 +236,8 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
}
}
vo
.
setOrderTicketVo
(
orderTicketVo
);
vo
.
setOrderTicketVo
(
orderTicketVo
);
vo
.
setEnterDescribe
(
dataUtils
.
getEnterInfo
(
performanceVo
.
getType
(),
orderTicketVo
.
getGetTicketType
(),
orderTicketVo
.
getIsStudent
(),
ticketVo
.
getIsTrueName
()));
vo
.
setEnterDescribe
(
dataUtils
.
getEnterInfo
(
performanceVo
.
getType
(),
orderTicketVo
.
getGetTicketType
(),
orderTicketVo
.
getIsStudent
(),
ticketVo
.
getIsTrueName
()));
// 添加 优惠券相关
vo
.
setOrderCouponsList
(
dataUtils
.
getOrderCoupon
(
orderId
));
}
}
log
.
info
(
UserPathDto
.
setData
(
"订单详情"
,
orderId
,
vo
));
log
.
info
(
UserPathDto
.
setData
(
"订单详情"
,
orderId
,
vo
));
return
vo
;
return
vo
;
...
...
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/utils/DataUtils.java
View file @
8c3b9e88
...
@@ -10,6 +10,7 @@ import com.liquidnet.service.kylin.dto.vo.express.KylinOrderExpressVo;
...
@@ -10,6 +10,7 @@ import com.liquidnet.service.kylin.dto.vo.express.KylinOrderExpressVo;
import
com.liquidnet.service.kylin.dto.vo.mongo.*
;
import
com.liquidnet.service.kylin.dto.vo.mongo.*
;
import
com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo
;
import
com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo
;
import
com.liquidnet.service.kylin.dto.vo.returns.KylinOrderRefundsVo
;
import
com.liquidnet.service.kylin.dto.vo.returns.KylinOrderRefundsVo
;
import
com.liquidnet.service.kylin.entity.KylinOrderCoupons
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.data.domain.PageRequest
;
import
org.springframework.data.domain.PageRequest
;
...
@@ -531,4 +532,15 @@ public class DataUtils {
...
@@ -531,4 +532,15 @@ public class DataUtils {
return
(
KylinOrderExpressVo
)
redisUtil
.
get
(
redisKey
);
return
(
KylinOrderExpressVo
)
redisUtil
.
get
(
redisKey
);
}
}
// 获取订单券的使用情况
public
ArrayList
<
KylinOrderCoupons
>
getOrderCoupon
(
String
orderId
){
String
redisKey
=
KylinRedisConst
.
ORDER_COUPON
.
concat
(
orderId
);
Object
obj
=
redisUtil
.
get
(
redisKey
);
if
(
obj
==
null
)
{
return
new
ArrayList
();
}
else
{
return
(
ArrayList
<
KylinOrderCoupons
>)
obj
;
}
}
}
}
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