订单 券相关入redis

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/constant/KylinRedisConst.java

@@ -26,6 +26,8 @@ public class KylinRedisConst {
     public static final String ORDER_REFUND_BY_ORDER_ID = "kylin:order:refund:orderId:";
     public static final String ORDER_REFUND = "kylin:order:refund:orderRefundsId:";
 
+    public static final String ORDER_COUPON = "kylin:order:coupon:id:";
+
     // 收货地址
     public static final String ORDER_REFUND_ADDRESS = "kylin:order:refund:address";
     // 手续费

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PayOrderParam.java

@@ -63,7 +63,7 @@ public class PayOrderParam {
     private String returnUrl;
 
     @ApiModelProperty(value = "优惠券类型")
-    private String voucherType;
+    private Integer voucherType;
     @ApiModelProperty(value = "优惠券码")
     private String voucherCode;
     @ApiModelProperty(value = "会员提前券码")

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinOrderCoupons.java

+package com.liquidnet.service.kylin.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 巡演
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class KylinOrderCoupons implements Serializable ,Cloneable {
+
+    private static final long serialVersionUID = 231L;
+
+    @TableId(value = "mid", type = IdType.AUTO)
+    private Integer mid;
+
+    /**
+     * order_id
+     */
+    private String orderId;
+
+    /**
+     * 券code = 券id
+     */
+    private String couponCode;
+
+    /**
+     * 券类型[1-代金券｜2-满减券｜3-兑换券｜4-折扣券 | 101-优先券]
+     */
+    private Integer couponType;
+
+    /**
+     * 券的优惠金额
+     */
+    private BigDecimal couponPrice;
+
+    /**
+     * comment
+     */
+    private String comment;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdAt;
+
+    /**
+     * 修改时间
+     */
+    private LocalDateTime updatedAt;
+
+    private static final KylinOrderCoupons obj = new KylinOrderCoupons();
+    public static KylinOrderCoupons getNew() {
+        try {
+            return (KylinOrderCoupons) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new KylinOrderCoupons();
+        }
+    }
+}

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/KylinOrderTicketsServiceImpl.java

@@ -20,10 +20,7 @@ import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
 import com.liquidnet.service.kylin.dto.vo.returns.PayInnerResultVo;
 import com.liquidnet.service.kylin.dto.vo.returns.PayResultVo;
-import com.liquidnet.service.kylin.entity.KylinOrderTicketEntities;
-import com.liquidnet.service.kylin.entity.KylinOrderTicketRelations;
-import com.liquidnet.service.kylin.entity.KylinOrderTicketStatus;
-import com.liquidnet.service.kylin.entity.KylinOrderTickets;
+import com.liquidnet.service.kylin.entity.*;
 import com.liquidnet.service.kylin.service.IKylinOrderTicketsOrderService;
 import com.liquidnet.service.order.utils.*;
 import com.taobao.api.TaobaoClient;
@@ -96,7 +93,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
         boolean isPay = true;
         List<AdamEntersVo> entersVoList = ObjectUtil.cloneArrayListObject();
         String uid = CurrentUtil.getCurrentUid();
-        if (payOrderParam.getVoucherType() != null && payOrderParam.getVoucherType().equals("exchange")) {
+        if (payOrderParam.getVoucherType() != null && payOrderParam.getVoucherType().equals(3)) {
             isPay = false;
         }
         try {
@@ -314,7 +311,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
         orderTickets.setPriceMember(ticketData.getMemberPrice());
 
         if (payOrderParam.getVoucherType() != null) {
-            orderTickets.setCouponType(payOrderParam.getVoucherType().equalsIgnoreCase("exchange") ? "exchange" : "no");
+            orderTickets.setCouponType(payOrderParam.getVoucherType().equals(3) ? "exchange" : "no");
         } else {
             orderTickets.setCouponType("no");
         }
@@ -331,6 +328,14 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
         if (advanceMap != null) {
             BigDecimal priceVoucher = (BigDecimal) advanceMap.get("voucher");
             Integer typeVoucher = (Integer) advanceMap.get("type");
+            KylinOrderCoupons couponsAdvance = KylinOrderCoupons.getNew();
+            couponsAdvance.setOrderId(orderTicketId);
+            couponsAdvance.setCouponCode(payOrderParam.getAdvanceCode());
+            couponsAdvance.setCouponType(101);
+            couponsAdvance.setCouponPrice(BigDecimal.ZERO);
+            couponsAdvance.setCreatedAt(now);
+            dataUtils.setOrderCoupon(orderTicketId,couponsAdvance);
+
             sqlsDataE.add(new Object[]{
                     orderTicketId, payOrderParam.getVoucherCode(), typeVoucher, priceVoucher, now, now
             });
@@ -343,6 +348,15 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                 throw new Exception("券不可用");
             }
             orderTickets.setPriceVoucher(priceVoucher);
+
+            KylinOrderCoupons couponsVoucher = KylinOrderCoupons.getNew();
+            couponsVoucher.setOrderId(orderTicketId);
+            couponsVoucher.setCouponCode(payOrderParam.getVoucherCode());
+            couponsVoucher.setCouponType(typeVoucher);
+            couponsVoucher.setCouponPrice(priceVoucher);
+            couponsVoucher.setCreatedAt(now);
+            dataUtils.setOrderCoupon(orderTicketId,couponsVoucher);
+
             sqlsDataE.add(new Object[]{
                     orderTicketId, payOrderParam.getVoucherCode(), typeVoucher, priceVoucher, now, now
             });

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/utils/DataUtils.java

@@ -8,6 +8,7 @@ import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
 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.KylinOrderRefundsVo;
+import com.liquidnet.service.kylin.entity.KylinOrderCoupons;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
@@ -234,8 +235,9 @@ public class DataUtils {
         }
     }
 
-    public void delOrderRefundVoByOrderId(String orderId) {
-        redisUtil.del(KylinRedisConst.ORDER_REFUND_BY_ORDER_ID + orderId);
+    public void setOrderCoupon(String orderId, KylinOrderCoupons bean){
+        String redisKey = KylinRedisConst.ORDER_COUPON.concat(orderId);
+        redisUtil.set(redisKey,bean);
     }
 
 }