修改文案

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinOrderTicketsService.java

@@ -32,10 +32,10 @@ public interface IKylinOrderTicketsService  {
     ResponseDto<Integer> orderUnPayCount();
 
     //想要退款详情
-    KylinOrderTicketPreVo toOrderRefundDetails(String orderId);
+    ResponseDto<KylinOrderTicketPreVo> toOrderRefundDetails(String orderId);
 
     //退款详情
-    OrderRefundVo orderRefundDetails(String orderId,String orderRefundId);
+    ResponseDto<OrderRefundVo> orderRefundDetails(String orderId,String orderRefundId);
 
     /**
      * 发起退款

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

@@ -89,12 +89,7 @@ public class KylinOrderTicketsController {
     @ApiOperation("想要退款订单详情")
     @ApiResponse(code = 200, message = "接口返回对象参数")
     public ResponseDto<KylinOrderTicketPreVo> toOrderRefundDetails(@RequestParam(value = "orderId", required = false) @NotNull(message = "订单id不能为空") String orderId) {
-        KylinOrderTicketPreVo vo = orderTicketsService.toOrderRefundDetails(orderId);
-        if (null == vo) {
-            return ResponseDto.failure(ErrorMapping.get("20003"));
-        } else {
-            return ResponseDto.success(vo);
-        }
+        return orderTicketsService.toOrderRefundDetails(orderId);
     }
 
     @PostMapping("sendOrderRefunds")
@@ -119,7 +114,7 @@ public class KylinOrderTicketsController {
     @ApiResponse(code = 200, message = "接口返回对象参数")
     public ResponseDto<OrderRefundVo> orderRefundDetails(@RequestParam(value = "orderId", required = true) @NotNull(message = "订单id不能为空") String orderId,
                                                          @RequestParam(value = "orderRefundId", required = true) @NotNull(message = "退款订单id不能为空") String orderRefundId) {
-        return orderTicketsService.orderRefundDetails(orderId, orderRefundId) == null ? ResponseDto.failure("获取失败") : ResponseDto.success(orderTicketsService.orderRefundDetails(orderId, orderRefundId));
+        return orderTicketsService.orderRefundDetails(orderId, orderRefundId);
     }
 
     @PostMapping("orderRefundWithdraw")

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

@@ -270,7 +270,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
     }
 
     @Override
-    public KylinOrderTicketPreVo toOrderRefundDetails(String orderId) {
+    public ResponseDto<KylinOrderTicketPreVo> toOrderRefundDetails(String orderId) {
         try {
             KylinOrderTicketPreVo vo = new KylinOrderTicketPreVo();
             String uid = CurrentUtil.getCurrentUid();
@@ -278,7 +278,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             KylinPerformanceVo performanceVo = dataUtils.getPerformanceVo(orderTicketVo.getPerformanceId());
             List<KylinOrderRefundsVo> kylinOrderRefundsVoBaseList = dataUtils.getOrderRefundVoByOrderId(orderTicketVo.getOrderTicketsId());
             if (!orderTicketVo.getUserId().equals(uid)) {
-                return null;
+                return ResponseDto.failure(ErrorMapping.get("20003"));
             }
             List<KylinOrderTicketEntitiesVo> kylinOrderTicketEntitiesVoList = orderTicketVo.getEntitiesVoList();
             List<KylinOrderTicketEntitiesPreRefundVo> kylinOrderTicketEntitiesPreRefundVos = new ArrayList<>();
@@ -301,15 +301,15 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             BeanUtils.copyProperties(orderTicketVo, vo);
             vo.setIsTrueName(performanceVo.getIsTrueName());
             vo.setEntitiesPreRefundVos(kylinOrderTicketEntitiesPreRefundVos);
-            return vo;
+            return ResponseDto.success(vo);
         } catch (Exception e) {
             e.printStackTrace();
-            return null;
+            return ResponseDto.failure(ErrorMapping.get("20030"));
         }
     }
 
     @Override
-    public OrderRefundVo orderRefundDetails(String orderId, String orderRefundId) {
+    public ResponseDto<OrderRefundVo> orderRefundDetails(String orderId, String orderRefundId) {
         try {
             OrderRefundVo vo = new OrderRefundVo();
             String uid = CurrentUtil.getCurrentUid();
@@ -317,15 +317,15 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             KylinPerformanceVo performanceVo = dataUtils.getPerformanceVo(orderTicketVo.getPerformanceId());
 
             if (!orderTicketVo.getUserId().equals(uid)) {
-                return null;
+                return ResponseDto.failure(ErrorMapping.get("20003"));
             }
             orderTicketVo.setFieldName(performanceVo.getFieldName());
             KylinOrderRefundsVo kylinOrderRefundsVoBase = dataUtils.getOrderRefundVo(orderRefundId);
             vo.setKylinOrderRefundsVoBaseList(kylinOrderRefundsVoBase);
             vo.setOrderTicketVo(orderTicketVo);
-            return vo;
+            return ResponseDto.success(vo);
         } catch (Exception e) {
-            return null;
+            return ResponseDto.failure(ErrorMapping.get("20030"));
         }
     }
 

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/resources/errors.properties

@@ -33,6 +33,7 @@
 20028=订单已失效
 20027=您已支付请刷新再试
 20029=未选择支付方式
+20030=无权查看
 
 #APP PARTNER
 20101=添加失败