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

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

@@ -40,7 +40,7 @@ public class KylinOrderTicketsRefundController {
     }
 
     @GetMapping("getChargesRatioItem")
-    @ApiOperation("想要退款订单详情")
+    @ApiOperation("阶梯退款详情")
     @ApiResponse(code = 200, message = "接口返回对象参数")
     public ResponseDto<OrderRefundPoundage> getChargesRatioItem(
             @RequestParam(value = "performanceId", required = true) @NotNull(message = "演出id") String performanceId
@@ -48,13 +48,22 @@ public class KylinOrderTicketsRefundController {
         return kylinOrderTicketsRefundService.getChargesRatioItem(performanceId);
     }
 
+    @GetMapping("getChargesRatioItem2")
+    @ApiOperation("阶梯退款注意事项")
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    public ResponseDto<String> getChargesRatioItem2(
+            @RequestParam(value = "performanceId", required = true) @NotNull(message = "演出id") String performanceId
+    ) {
+        return kylinOrderTicketsRefundService.getChargesRatioItem2(performanceId);
+    }
+
     @PostMapping("sendOrderRefunds")
     @ApiOperation("发起退款申请")
     @ApiResponse(code = 200, message = "接口返回对象参数")
     @ApiImplicitParams({
             @ApiImplicitParam(type = "form", dataType = "String", name = "orderId", value = "订单ID", required = true),
             @ApiImplicitParam(type = "form", dataType = "String", name = "orderTicketEntitiesId", value = "订单入场人ID", required = true),
-            @ApiImplicitParam(type = "form", dataType = "String", name = "reason", value = "退款申请备注", required = true),
+            @ApiImplicitParam(type = "form", dataType = "String", name = "reason", value = "退款申请备注", required = false),
             @ApiImplicitParam(type = "form", dataType = "String", name = "picList", value = "图片"),
             @ApiImplicitParam(type = "form", dataType = "String", name = "ticketNum", value = "纸质票号"),
             @ApiImplicitParam(type = "form", dataType = "Integer", name = "sendExpressType", value = "快递方式 1上门取件 2自主发货"),
@@ -67,7 +76,7 @@ public class KylinOrderTicketsRefundController {
     public ResponseDto sendOrderRefund(
             @RequestParam(value = "orderId", required = true) @NotNull(message = "订单ID不能为空") String orderId,
             @RequestParam(value = "orderTicketEntitiesId", required = true) @NotNull(message = "票单ID不能为空") String orderTicketEntitiesId,
-            @RequestParam(value = "reason", required = true) @NotNull(message = "退款原因不能为空") String reason,
+            @RequestParam(value = "reason", required = false) @NotNull(message = "退款原因不能为空") String reason,
             @RequestParam(value = "picList", required = false) String picList,
             @RequestParam(value = "ticketNum", required = false) String ticketNum,
 

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

@@ -6,6 +6,7 @@ import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
+import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
 import com.liquidnet.service.kylin.dto.vo.admin.OrderRefundAddress;
 import com.liquidnet.service.kylin.dto.vo.admin.OrderRefundPoundage;
@@ -403,6 +404,11 @@ public class KylinOrderTicketsRefundServiceImpl {
         }
     }
 
+    // 返回手续费比例
+    public ResponseDto<String> getChargesRatioItem2(String performanceId) {
+        return ResponseDto.success(dataUtils.getExplain(performanceId));
+    }
+
     //    @Async
     public void expressPlace(Integer sendExpressType, String expressNumber, String expressContacts, String expressPhone, String sendExpressAddress, String appointmentTime, KylinOrderTicketVo orderTicketVo, KylinPerformanceVo performanceVo, String orderRefundId) {
         try {

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

@@ -1123,6 +1123,15 @@ public class DataUtils {
         return aNew;
     }
 
+    public String getExplain(String performanceId){
+        Object obj = redisUtil.get(KylinRedisConst.ORDER_REFUND_POUNDAGE_EXPLAIN.concat(":").concat(performanceId));
+        if (null == obj) {
+            return "";
+        } else {
+            return (String) obj;
+        }
+    }
+
     // 获取订单券的使用情况
     public ArrayList<KylinOrderCoupons> getOrderCoupon(String orderId) {
         String redisKey = KylinRedisConst.ORDER_COUPON.concat(orderId);