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

修改了获取 是否开启阶段退款 的获取条件由原来直接获取值改为判断是否配置了阶段集合的长度 为null 或者 0 为未开启
隐藏了 admin配置 是否开启退款须知的按钮
修改了 移动端获取当前应该收取手续费的比例
暂时缺少 配置注意事项 和 配置 阶段退款集合 的接口
//todo 阶梯退票 带这个的是修改方法或者方法体

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/admin/OrderRefundPoundage.java

@@ -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")

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/mongo/KylinPerformanceVo.java

@@ -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();

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/refundConfig.html

@@ -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">

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinPerformancesAdminServiceImpl.java

@@ -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());

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsRefundServiceImpl.java

@@ -81,7 +81,7 @@ public class KylinOrderTicketsRefundServiceImpl {
             KylinPerformanceVo performanceVo = dataUtils.getPerformanceVo(orderTicketVo.getPerformanceId());
             List<KylinOrderRefundsVo> kylinOrderRefundsVoBaseList = dataUtils.getOrderRefundVoByOrderId(orderTicketVo.getOrderTicketsId());
             // 判断是否购买人
-            if(!SuperAccountUtils.isSuperAccount(uid,orderTicketVo.getUserId())){
+            if (!SuperAccountUtils.isSuperAccount(uid, orderTicketVo.getUserId())) {
                 return ResponseDto.failure(ErrorMapping.get("20003"));
             }
 //            if (uid.equals("809406") || uid.equals("773650")) {
@@ -104,7 +104,7 @@ public class KylinOrderTicketsRefundServiceImpl {
                 item.setPriceActual(orderTicketVo.getPriceActual().subtract(orderTicketVo.getPriceExpress()).divide(BigDecimal.valueOf(orderTicketVo.getNumber()), 2, BigDecimal.ROUND_HALF_UP));
                 item.setPriceCanRefund(dataUtils.getCanRefundOrderEntitiesPrice(orderTicketVo, kylinOrderRefundsVoBaseList, item.getOrderTicketEntitiesId()));
                 // 手续费处理
-                BigDecimal chargesRatio = getChargesRatio(orderTicketVo.getUseStart(), performanceVo.getIsRefundPoundage(),performanceVo.getPerformancesId());
+                BigDecimal chargesRatio = getChargesRatio(orderTicketVo.getUseStart(), performanceVo.getIsRefundPoundage(dataUtils.getRefundPoundage(1, performanceVo.getPerformancesId()).size()), performanceVo.getPerformancesId());
                 BigDecimal chargesPrice = item.getPriceCanRefund().multiply(chargesRatio).setScale(2, BigDecimal.ROUND_HALF_UP);
                 item.setPriceCanRefund(item.getPriceCanRefund().subtract(chargesPrice));
                 item.setChargesRatio(chargesRatio);
@@ -120,7 +120,7 @@ public class KylinOrderTicketsRefundServiceImpl {
                 orderTicketVo.setOrderCode(orderTicketVo.getOrderCode().substring(orderTicketVo.getOrderCode().length() - 10));
             }
             // 手续费相关
-            OrderRefundPoundageAll refundPoundageAll = dataUtils.getRefundPoundageAll(performanceVo.getIsRefundPoundage(),performanceVo.getPerformancesId());
+            OrderRefundPoundageAll refundPoundageAll = dataUtils.getRefundPoundageAll(performanceVo.getIsRefundPoundage(dataUtils.getRefundPoundage(1, performanceVo.getPerformancesId()).size()), performanceVo.getPerformancesId());
             // 券
             ArrayList<KylinOrderCoupons> orderCoupon = dataUtils.getOrderCoupon(orderId);
             // 快递地址
@@ -138,7 +138,7 @@ public class KylinOrderTicketsRefundServiceImpl {
                 for (KylinOrderRefundsVo refundVo : kylinOrderRefundsVoBaseList) {
                     int status = refundVo.getStatus();
                     if (status != KylinTableStatusConst.ORDER_REFUND_STATUS_CANCEL && status != KylinTableStatusConst.ORDER_REFUND_STATUS_REJECT) { //退款流程未完成和已完成的
-                        refundNum ++;
+                        refundNum++;
                         priceExpressOld = priceExpressOld.add(refundVo.getPriceExpress());
                     }
                 }
@@ -148,7 +148,7 @@ public class KylinOrderTicketsRefundServiceImpl {
             }
             // 整理返回数据
             BeanUtils.copyProperties(orderTicketVo, vo);
-            vo.setIsRefundPoundage(performanceVo.getIsRefundPoundage());
+            vo.setIsRefundPoundage(performanceVo.getIsRefundPoundage(dataUtils.getRefundPoundage(1, performanceVo.getPerformancesId()).size()));
             vo.setIsRefundVoucher(performanceVo.getIsRefundVoucher());
             vo.setIsBackPaperTicket(performanceVo.getIsBackPaperTicket());
             vo.setIsRefundExpressNew(performanceVo.getIsRefundExpressNew());
@@ -177,7 +177,7 @@ public class KylinOrderTicketsRefundServiceImpl {
             String uid = CurrentUtil.getCurrentUid();
             KylinOrderTicketVo orderTicketVo = dataUtils.getOrderTicketVo(orderId);
             List<KylinOrderRefundsVo> kylinOrderRefundsVoBaseList = dataUtils.getOrderRefundVoByOrderId(orderTicketVo.getOrderTicketsId());
-            if(!SuperAccountUtils.isSuperAccount(uid,orderTicketVo.getUserId())){
+            if (!SuperAccountUtils.isSuperAccount(uid, orderTicketVo.getUserId())) {
                 return ResponseDto.failure(ErrorMapping.get("20003"));
             }
 //            if (uid.equals("809406") || uid.equals("773650")) {
@@ -234,7 +234,7 @@ public class KylinOrderTicketsRefundServiceImpl {
             }
 
             // 手续费处理
-            BigDecimal chargesRatio = getChargesRatio(orderTicketVo.getUseStart(), performanceVo.getIsRefundPoundage(),performanceVo.getPerformancesId());
+            BigDecimal chargesRatio = getChargesRatio(orderTicketVo.getUseStart(), performanceVo.getIsRefundPoundage(dataUtils.getRefundPoundage(1, performanceVo.getPerformancesId()).size()), performanceVo.getPerformancesId());
             BigDecimal priceCharges = refundSinglePrice.multiply(chargesRatio).setScale(2, BigDecimal.ROUND_HALF_UP);
             refundSinglePrice = refundSinglePrice.subtract(priceCharges);
             if (refundSinglePrice.compareTo(BigDecimal.ZERO) <= 0) {
@@ -250,7 +250,7 @@ public class KylinOrderTicketsRefundServiceImpl {
                 for (KylinOrderRefundsVo refundVo : kylinOrderRefundsVoBaseList) {
                     int status = refundVo.getStatus();
                     if (status != KylinTableStatusConst.ORDER_REFUND_STATUS_CANCEL && status != KylinTableStatusConst.ORDER_REFUND_STATUS_REJECT) { //退款流程未完成和已完成的
-                        refundNum ++;
+                        refundNum++;
                         priceExpressOld = priceExpressOld.add(refundVo.getPriceExpress());
                     }
                 }
@@ -290,7 +290,7 @@ public class KylinOrderTicketsRefundServiceImpl {
             KylinOrderTicketVo orderTicketVo = dataUtils.getOrderTicketVo(orderId);
             KylinPerformanceVo performanceVo = dataUtils.getPerformanceVo(orderTicketVo.getPerformanceId());
 
-            if(!SuperAccountUtils.isSuperAccount(uid,orderTicketVo.getUserId())){
+            if (!SuperAccountUtils.isSuperAccount(uid, orderTicketVo.getUserId())) {
                 return ResponseDto.failure(ErrorMapping.get("20003"));
             }
 //            if (uid.equals("809406") || uid.equals("773650")) {
@@ -318,52 +318,65 @@ public class KylinOrderTicketsRefundServiceImpl {
     }
 
     // 返回手续费比例
-    private BigDecimal getChargesRatio(String useStart, Integer isRefundPoundage,String performanceId) {
-        ArrayList<OrderRefundPoundage> refundPoundage = dataUtils.getRefundPoundage(isRefundPoundage,performanceId);
+    private BigDecimal getChargesRatio(String useStart, Integer isRefundPoundage, String performanceId) {
+        ArrayList<OrderRefundPoundage> refundPoundage = dataUtils.getRefundPoundage(isRefundPoundage, performanceId);
         // 手续费比例
         BigDecimal chargesRatio = BigDecimal.valueOf(0);
         if (!CollectionUtils.isEmpty(refundPoundage)) {
             // 票种演出开始时间
             DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-            LocalDateTime useStartD = LocalDateTime.parse(useStart, df);
-            // 3、15天之前的时间 时间可变
-            int oneDay = refundPoundage.get(0).getDay();
-            int twoDay = refundPoundage.get(1).getDay();
-            LocalDateTime useStartD15Before = useStartD.minusDays(oneDay);
-            LocalDateTime useStartD3Before = useStartD.minusDays(twoDay);
             // 当前时间
             LocalDateTime nowTime = LocalDateTime.now();
-
-            if (useStartD15Before.isAfter(nowTime)) { // 15天以前的时间大于当前时间 距离演出开始日期>15天
-                int isCanRefund = refundPoundage.get(0).getIsCanRefund();
-                if (isCanRefund > 0) {
-                    chargesRatio = refundPoundage.get(0).getPresent();
-                } else {
-                    chargesRatio = BigDecimal.valueOf(Long.parseLong("-1"));
-                }
-            } else if (useStartD3Before.isAfter(nowTime)) { // 3天以前的时间大于当前时间 距离演出开始日期>3天-15天 含15天
-                int isCanRefund = refundPoundage.get(1).getIsCanRefund();
-                if (isCanRefund > 0) {
-                    chargesRatio = refundPoundage.get(1).getPresent();
-                } else {
-                    chargesRatio = BigDecimal.valueOf(Long.parseLong("-1"));
-                }
-            } else { // 三天以内 <=3
-                int isCanRefund = refundPoundage.get(2).getIsCanRefund();
-                if (isCanRefund > 0) {
-                    chargesRatio = refundPoundage.get(2).getPresent();
-                } else {
-                    chargesRatio = BigDecimal.valueOf(Long.parseLong("1"));
-                    // return ResponseDto.failure("当前日期不支持退票");
+            //todo 阶梯退票 下面注释为原逻辑 这是判断是否支持退手续费和退多少
+            for (OrderRefundPoundage item : refundPoundage) {
+                LocalDateTime t = LocalDateTime.parse(item.getDay(), df);//当前阶段时间
+                if(nowTime.isBefore(t)){
+                    int isCanRefund = item.getIsCanRefund();
+                    if (isCanRefund > 0) {
+                        chargesRatio = item.getPresent();
+                    } else {
+                        chargesRatio = BigDecimal.valueOf(Long.parseLong("-1"));
+                    }
+                    break;
                 }
             }
+//            LocalDateTime useStartD = LocalDateTime.parse(useStart, df);
+            // 3、15天之前的时间 时间可变
+//            int oneDay = refundPoundage.get(0).getDay();
+//            int twoDay = refundPoundage.get(1).getDay();
+//            LocalDateTime useStartD15Before = useStartD.minusDays(oneDay);
+//            LocalDateTime useStartD3Before = useStartD.minusDays(twoDay);
+//
+//            if (useStartD15Before.isAfter(nowTime)) { // 15天以前的时间大于当前时间 距离演出开始日期>15天
+//                int isCanRefund = refundPoundage.get(0).getIsCanRefund();
+//                if (isCanRefund > 0) {
+//                    chargesRatio = refundPoundage.get(0).getPresent();
+//                } else {
+//                    chargesRatio = BigDecimal.valueOf(Long.parseLong("-1"));
+//                }
+//            } else if (useStartD3Before.isAfter(nowTime)) { // 3天以前的时间大于当前时间 距离演出开始日期>3天-15天 含15天
+//                int isCanRefund = refundPoundage.get(1).getIsCanRefund();
+//                if (isCanRefund > 0) {
+//                    chargesRatio = refundPoundage.get(1).getPresent();
+//                } else {
+//                    chargesRatio = BigDecimal.valueOf(Long.parseLong("-1"));
+//                }
+//            } else { // 三天以内 <=3
+//                int isCanRefund = refundPoundage.get(2).getIsCanRefund();
+//                if (isCanRefund > 0) {
+//                    chargesRatio = refundPoundage.get(2).getPresent();
+//                } else {
+//                    chargesRatio = BigDecimal.valueOf(Long.parseLong("1"));
+//                    // return ResponseDto.failure("当前日期不支持退票");
+//                }
+//            }
             return chargesRatio;
         } else { // 无手续费
             return chargesRatio;
         }
     }
 
-//    @Async
+    //    @Async
     public void expressPlace(Integer sendExpressType, String expressNumber, String expressContacts, String expressPhone, String sendExpressAddress, String appointmentTime, KylinOrderTicketVo orderTicketVo, KylinPerformanceVo performanceVo, String orderRefundId) {
         try {
 //            Thread.sleep(1000 * 60);

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

@@ -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);