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

Commit a30eea66 authored by jiangxiulong's avatar jiangxiulong

3天内改成不支持退票 增加特别说明

parent 09956138
...@@ -36,6 +36,7 @@ public class KylinRedisConst { ...@@ -36,6 +36,7 @@ public class KylinRedisConst {
public static final String ORDER_REFUND_ADDRESS = "kylin:order:refund:address"; public static final String ORDER_REFUND_ADDRESS = "kylin:order:refund:address";
// 手续费 // 手续费
public static final String ORDER_REFUND_POUNDAGE = "kylin:order:poundage"; public static final String ORDER_REFUND_POUNDAGE = "kylin:order:poundage";
public static final String ORDER_REFUND_POUNDAGE_EXPLAIN = "kylin:order:poundageExplain";
public static final String USERID_BUY_INFO = "kylin:buy:userId:"; public static final String USERID_BUY_INFO = "kylin:buy:userId:";
public static final String IDCARD_BUY_INFO = "kylin:buy:idCard:"; public static final String IDCARD_BUY_INFO = "kylin:buy:idCard:";
......
...@@ -6,9 +6,12 @@ import lombok.Data; ...@@ -6,9 +6,12 @@ import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
/** /**
* @version V1.0 * <p>
* @class: OrderRefundPoundage * 退款手续费说明
* @Copyright: LightNet @ Copyright (c) 2021 * </p>
*
* @author jiangxiulong
* @since 2021-10-13
*/ */
@Data @Data
public class OrderRefundPoundage implements Cloneable { public class OrderRefundPoundage implements Cloneable {
......
package com.liquidnet.service.kylin.dto.vo.admin;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.List;
/**
* <p>
* 退款手续费说明
* </p>
*
* @author jiangxiulong
* @since 2021-10-13
*/
@Data
public class OrderRefundPoundageAll implements Serializable, Cloneable {
private static final long serialVersionUID = -5077177070181399707L;
@ApiModelProperty(value = "特殊说明")
private String explain;
@ApiModelProperty(value = "手续费列表")
private List<OrderRefundPoundage> orderRefundPoundageList;
private static final OrderRefundPoundageAll obj = new OrderRefundPoundageAll();
public static OrderRefundPoundageAll getNew() {
try {
return (OrderRefundPoundageAll) obj.clone();
} catch (CloneNotSupportedException e) {
return new OrderRefundPoundageAll();
}
}
}
package com.liquidnet.service.kylin.dto.vo.returns; package com.liquidnet.service.kylin.dto.vo.returns;
import com.liquidnet.service.kylin.dto.vo.admin.OrderRefundPoundageAll;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketEntitiesVo; import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketEntitiesVo;
import com.liquidnet.service.kylin.entity.KylinOrderTicketRelations; import com.liquidnet.service.kylin.entity.KylinOrderTicketRelations;
import com.liquidnet.service.kylin.entity.KylinOrderTicketStatus; import com.liquidnet.service.kylin.entity.KylinOrderTicketStatus;
...@@ -89,7 +90,7 @@ public class KylinOrderTicketPreVo implements Serializable, Cloneable { ...@@ -89,7 +90,7 @@ public class KylinOrderTicketPreVo implements Serializable, Cloneable {
private Integer isRefundExpress; private Integer isRefundExpress;
@ApiModelProperty(value = "手续费规则列表") @ApiModelProperty(value = "手续费规则列表")
private ArrayList<OrderRefundPoundage> refundPoundageList; private OrderRefundPoundageAll refundPoundageAll;
@ApiModelProperty(value = "订单使用优惠券列表") @ApiModelProperty(value = "订单使用优惠券列表")
private ArrayList<KylinOrderCoupons> orderCouponList; private ArrayList<KylinOrderCoupons> orderCouponList;
@ApiModelProperty(value = "退款快递统一寄回地址") @ApiModelProperty(value = "退款快递统一寄回地址")
......
...@@ -9,6 +9,7 @@ import com.liquidnet.service.base.constant.MQConst; ...@@ -9,6 +9,7 @@ import com.liquidnet.service.base.constant.MQConst;
import com.liquidnet.service.kylin.constant.KylinTableStatusConst; import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
import com.liquidnet.service.kylin.dto.vo.admin.OrderRefundAddress; import com.liquidnet.service.kylin.dto.vo.admin.OrderRefundAddress;
import com.liquidnet.service.kylin.dto.vo.admin.OrderRefundPoundage; import com.liquidnet.service.kylin.dto.vo.admin.OrderRefundPoundage;
import com.liquidnet.service.kylin.dto.vo.admin.OrderRefundPoundageAll;
import com.liquidnet.service.kylin.dto.vo.express.KylinOrderExpressVo; import com.liquidnet.service.kylin.dto.vo.express.KylinOrderExpressVo;
import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo; import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;
import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo; import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
...@@ -117,7 +118,7 @@ public class KylinOrderTicketsRefundServiceImpl { ...@@ -117,7 +118,7 @@ public class KylinOrderTicketsRefundServiceImpl {
orderTicketVo.setOrderCode(orderTicketVo.getOrderCode().substring(orderTicketVo.getOrderCode().length() - 10)); orderTicketVo.setOrderCode(orderTicketVo.getOrderCode().substring(orderTicketVo.getOrderCode().length() - 10));
} }
// 手续费相关 // 手续费相关
ArrayList<OrderRefundPoundage> refundPoundage = dataUtils.getRefundPoundage(performanceVo.getIsRefundPoundage()); OrderRefundPoundageAll refundPoundageAll = dataUtils.getRefundPoundageAll(performanceVo.getIsRefundPoundage());
// 券 // 券
ArrayList<KylinOrderCoupons> orderCoupon = dataUtils.getOrderCoupon(orderId); ArrayList<KylinOrderCoupons> orderCoupon = dataUtils.getOrderCoupon(orderId);
// 快递地址 // 快递地址
...@@ -126,7 +127,7 @@ public class KylinOrderTicketsRefundServiceImpl { ...@@ -126,7 +127,7 @@ public class KylinOrderTicketsRefundServiceImpl {
BeanUtils.copyProperties(orderTicketVo, vo); BeanUtils.copyProperties(orderTicketVo, vo);
vo.setIsRefundPoundage(performanceVo.getIsRefundPoundage()); vo.setIsRefundPoundage(performanceVo.getIsRefundPoundage());
vo.setIsRefundVoucher(performanceVo.getIsRefundVoucher()); vo.setIsRefundVoucher(performanceVo.getIsRefundVoucher());
vo.setRefundPoundageList(refundPoundage); vo.setRefundPoundageAll(refundPoundageAll);
vo.setOrderCouponList(orderCoupon); vo.setOrderCouponList(orderCoupon);
vo.setRefundAddress(refundAddress); vo.setRefundAddress(refundAddress);
vo.setIsTrueName(performanceVo.getIsTrueName()); vo.setIsTrueName(performanceVo.getIsTrueName());
......
...@@ -8,6 +8,7 @@ import com.liquidnet.service.kylin.constant.KylinRedisConst; ...@@ -8,6 +8,7 @@ import com.liquidnet.service.kylin.constant.KylinRedisConst;
import com.liquidnet.service.kylin.constant.KylinTableStatusConst; import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
import com.liquidnet.service.kylin.dto.vo.admin.OrderRefundAddress; import com.liquidnet.service.kylin.dto.vo.admin.OrderRefundAddress;
import com.liquidnet.service.kylin.dto.vo.admin.OrderRefundPoundage; import com.liquidnet.service.kylin.dto.vo.admin.OrderRefundPoundage;
import com.liquidnet.service.kylin.dto.vo.admin.OrderRefundPoundageAll;
import com.liquidnet.service.kylin.dto.vo.express.KylinOrderExpressRouteVo; import com.liquidnet.service.kylin.dto.vo.express.KylinOrderExpressRouteVo;
import com.liquidnet.service.kylin.dto.vo.express.KylinOrderExpressVo; 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.*;
...@@ -716,7 +717,7 @@ public class DataUtils { ...@@ -716,7 +717,7 @@ public class DataUtils {
vo3.setDay(0); vo3.setDay(0);
vo3.setContent("距离演出开始日期≤3天(含演出当天)"); vo3.setContent("距离演出开始日期≤3天(含演出当天)");
vo3.setPresent(BigDecimal.valueOf(1)); vo3.setPresent(BigDecimal.valueOf(1));
vo3.setIsCanRefund(1); vo3.setIsCanRefund(0);
orderRefundPoundageArrayList.add(vo1); orderRefundPoundageArrayList.add(vo1);
orderRefundPoundageArrayList.add(vo2); orderRefundPoundageArrayList.add(vo2);
orderRefundPoundageArrayList.add(vo3); orderRefundPoundageArrayList.add(vo3);
...@@ -729,6 +730,24 @@ public class DataUtils { ...@@ -729,6 +730,24 @@ public class DataUtils {
return orderRefundPoundageArrayList; return orderRefundPoundageArrayList;
} }
} }
// 获取手续费ALL说明
public OrderRefundPoundageAll getRefundPoundageAll(Integer isRefundPoundage) {
ArrayList<OrderRefundPoundage> refundPoundage = getRefundPoundage(isRefundPoundage);
OrderRefundPoundageAll aNew = OrderRefundPoundageAll.getNew();
aNew.setOrderRefundPoundageList(refundPoundage);
Object obj = redisUtil.get(KylinRedisConst.ORDER_REFUND_POUNDAGE_EXPLAIN);
if (null == obj) {
String explain = "1.存在异常订购行为的订单,平台有权不予办理退票。\n2.不支持退票示例:如演出时间为5月1日,则不支持退票的时间范围为4月28日-30日及5月1日(演出当天)。";
redisUtil.set(KylinRedisConst.ORDER_REFUND_POUNDAGE_EXPLAIN, explain);
aNew.setExplain(explain);
} else {
String explain = (String) obj;
aNew.setExplain(explain);
}
return aNew;
}
// 获取订单券的使用情况 // 获取订单券的使用情况
public ArrayList<KylinOrderCoupons> getOrderCoupon(String orderId) { public ArrayList<KylinOrderCoupons> getOrderCoupon(String orderId) {
......
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