记得上下班打卡 | git大法好,push需谨慎

Commit 8c3b9e88 authored by 胡佳晨's avatar 胡佳晨

添加 订单 优惠券

parent 48a045a6
...@@ -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();
......
...@@ -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;
......
...@@ -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;
}
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment