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

Commit ac0d256a authored by 胡佳晨's avatar 胡佳晨

添加了 注意事项的 set工具方法

修改了获取 是否开启阶段退款 的获取条件由原来直接获取值改为判断是否配置了阶段集合的长度 为null 或者 0 为未开启
隐藏了 admin配置 是否开启退款须知的按钮
修改了 移动端获取当前应该收取手续费的比例
暂时缺少 配置注意事项 和 配置 阶段退款集合 的接口
//todo 阶梯退票 带这个的是修改方法或者方法体
parent 38115a72
......@@ -15,8 +15,8 @@ import java.math.BigDecimal;
*/
@Data
public class OrderRefundPoundage implements Cloneable {
@ApiModelProperty(value = "天数")
private int day;
@ApiModelProperty(value = "日期")
private String day;
@ApiModelProperty(value = "距离演出开始日期>15天")
private String content;
@ApiModelProperty(value = "费率 如果手续费是0.1")
......
......@@ -153,6 +153,14 @@ public class KylinPerformanceVo implements Serializable, Cloneable {
}
}
//todo 阶梯退票 所有调用这个方法的地方都有改动
public Integer getIsRefundPoundage(Integer i) {
if(null==i || 0==i){
return 0;
}
return 1;
}
public void setPerformance(KylinPerformances performance) {
this.mid = performance.getMid();
this.performancesId = performance.getPerformancesId();
......
......@@ -40,7 +40,8 @@
class="form-control" id="endTime" placeholder="结束时间选择" name="refundCloseTime"
required/>
</div>
<div class="form-group">
<!-- todo 阶梯退票 添加了 style="display: none" 这个注释你看完需要删除-->
<div class="form-group" style="display: none">
<label class="col-sm-3 control-label is-required">用户退款手续费:</label>
<div class="col-sm-8">
<div class="radio check-box">
......
......@@ -744,7 +744,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
vo.setRefundCloseTime(kylinPerformanceStatus.getRefundCloseTime() == null ? "" : DateUtil.Formatter.yyyyMMddHHmmss.format(kylinPerformanceStatus.getRefundCloseTime()));
vo.setRefundOpenTime(kylinPerformanceStatus.getRefundOpenTime() == null ? "" : DateUtil.Formatter.yyyyMMddHHmmss.format(kylinPerformanceStatus.getRefundOpenTime()));
vo.setIsRefundPoundage(kylinPerformanceStatus.getIsRefundPoundage());
// vo.setIsRefundPoundage(kylinPerformanceStatus.getIsRefundPoundage());
vo.setIsRefundVoucher(kylinPerformanceStatus.getIsRefundVoucher());
vo.setIsRefundExpress(kylinPerformanceStatus.getIsRefundExpress());
vo.setIsBackPaperTicket(kylinPerformanceStatus.getIsBackPaperTicket());
......
......@@ -1097,25 +1097,6 @@ public class DataUtils {
if (null != isRefundPoundage && isRefundPoundage > 0) { // 开启了演出退票有手续费
Object obj = redisUtil.get(KylinRedisConst.ORDER_REFUND_POUNDAGE.concat(":").concat(performanceId));
if (obj == null) {
OrderRefundPoundage vo1 = OrderRefundPoundage.getNew();
vo1.setDay(15);
vo1.setContent("距离演出开始日期>15天");
vo1.setPresent(BigDecimal.valueOf(0.1));
vo1.setIsCanRefund(1);
OrderRefundPoundage vo2 = OrderRefundPoundage.getNew();
vo2.setDay(3);
vo2.setContent("距离演出开始日期>3天-15天(含15天)");
vo2.setPresent(BigDecimal.valueOf(0.5));
vo2.setIsCanRefund(1);
OrderRefundPoundage vo3 = OrderRefundPoundage.getNew();
vo3.setDay(0);
vo3.setContent("距离演出开始日期≤3天(含演出当天)");
vo3.setPresent(BigDecimal.valueOf(1));
vo3.setIsCanRefund(0);
orderRefundPoundageArrayList.add(vo1);
orderRefundPoundageArrayList.add(vo2);
orderRefundPoundageArrayList.add(vo3);
redisUtil.set(KylinRedisConst.ORDER_REFUND_POUNDAGE.concat(":").concat(performanceId), orderRefundPoundageArrayList);
return orderRefundPoundageArrayList;
} else {
return (ArrayList<OrderRefundPoundage>) obj;
......@@ -1125,6 +1106,17 @@ public class DataUtils {
}
}
/**
* //todo 阶梯退票
* 设置手续费
*
* @param orderRefundPoundageArrayList 手续费数据集合
* @param performanceId 演出id
*/
public void setRefundPoundage(ArrayList<OrderRefundPoundage> orderRefundPoundageArrayList, String performanceId) {
redisUtil.set(KylinRedisConst.ORDER_REFUND_POUNDAGE.concat(":").concat(performanceId), orderRefundPoundageArrayList);
}
// 获取手续费ALL说明
public OrderRefundPoundageAll getRefundPoundageAll(Integer isRefundPoundage, String performanceId) {
ArrayList<OrderRefundPoundage> refundPoundage = getRefundPoundage(isRefundPoundage, performanceId);
......@@ -1134,9 +1126,7 @@ public class DataUtils {
Object obj = redisUtil.get(KylinRedisConst.ORDER_REFUND_POUNDAGE_EXPLAIN.concat(":").concat(performanceId));
if (null == obj) {
String explain = "1.存在异常订购行为的订单,平台有权不予办理退票。\n2.不支持退票示例:如演出时间为5月1日,则不支持退票的时间范围为4月28日-30日及5月1日(演出当天)。";
redisUtil.set(KylinRedisConst.ORDER_REFUND_POUNDAGE_EXPLAIN.concat(":").concat(performanceId), explain);
aNew.setExplain(explain);
aNew.setExplain("");
} else {
String explain = (String) obj;
aNew.setExplain(explain);
......@@ -1144,6 +1134,17 @@ public class DataUtils {
return aNew;
}
/**
* //todo 阶梯退票
* 设置 注意事项
*
* @param explain 注意事项
* @param performanceId 演出id
*/
public void setRefundPoundageAll(String explain, String performanceId) {
redisUtil.set(KylinRedisConst.ORDER_REFUND_POUNDAGE_EXPLAIN.concat(":").concat(performanceId), explain);
}
// 获取订单券的使用情况
public ArrayList<KylinOrderCoupons> getOrderCoupon(String orderId) {
String redisKey = KylinRedisConst.ORDER_COUPON.concat(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