Merge branch 'hjc_阶段退票' into 阶梯退票_羊毛券_合并分支

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

@@ -2,6 +2,7 @@ package com.liquidnet.service.kylin.controller;
 
 
 import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.kylin.dto.vo.admin.OrderRefundPoundage;
 import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderTicketPreVo;
 import com.liquidnet.service.kylin.dto.vo.returns.OrderRefundVo;
 import com.liquidnet.service.kylin.service.impl.KylinOrderTicketsRefundServiceImpl;
@@ -38,6 +39,15 @@ public class KylinOrderTicketsRefundController {
         return kylinOrderTicketsRefundService.toOrderRefundDetails(orderId);
     }
 
+    @GetMapping("getChargesRatioItem")
+    @ApiOperation("想要退款订单详情")
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    public ResponseDto<OrderRefundPoundage> getChargesRatioItem(
+            @RequestParam(value = "performanceId", required = true) @NotNull(message = "演出id") String performanceId
+    ) {
+        return kylinOrderTicketsRefundService.getChargesRatioItem(performanceId);
+    }
+
     @PostMapping("sendOrderRefunds")
     @ApiOperation("发起退款申请")
     @ApiResponse(code = 200, message = "接口返回对象参数")

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

@@ -378,6 +378,31 @@ public class KylinOrderTicketsRefundServiceImpl {
         }
     }
 
+    // 返回手续费比例
+    public ResponseDto<OrderRefundPoundage> getChargesRatioItem(String performanceId) {
+        KylinPerformanceVo performanceVo = dataUtils.getPerformanceVo(performanceId);
+        int isRefundPoundage = performanceVo.getIsRefundPoundage(dataUtils.getRefundPoundage(1, performanceVo.getPerformancesId()).size());
+        ArrayList<OrderRefundPoundage> refundPoundage = dataUtils.getRefundPoundage(isRefundPoundage, performanceId);
+        OrderRefundPoundage a = null;
+        if (!CollectionUtils.isEmpty(refundPoundage)) {
+            // 票种演出开始时间
+            DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+            // 当前时间
+            LocalDateTime nowTime = LocalDateTime.now();
+            //todo 阶梯退票 下面注释为原逻辑 这是判断是否支持退手续费和退多少
+            for (OrderRefundPoundage item : refundPoundage) {
+                LocalDateTime t = LocalDateTime.parse(item.getDay(), df);//当前阶段时间
+                if(nowTime.isBefore(t)){
+                    a = item;
+                    break;
+                }
+            }
+            return ResponseDto.success(a);
+        } else { // 无手续费
+            return ResponseDto.success(a);
+        }
+    }
+
     //    @Async
     public void expressPlace(Integer sendExpressType, String expressNumber, String expressContacts, String expressPhone, String sendExpressAddress, String appointmentTime, KylinOrderTicketVo orderTicketVo, KylinPerformanceVo performanceVo, String orderRefundId) {
         try {