|  | @@ -294,12 +294,9 @@ public class OrderRefundController {
 | 
	
		
			
				|  |  |      @PostMapping("/apply")
 | 
	
		
			
				|  |  |      @ApiOperation(value = "申请退款", notes = "申请退款")
 | 
	
		
			
				|  |  |      public ResponseEntity<String> apply(@Valid @RequestBody OrderRefundParam orderRefundParam) {
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  |          log.info("小程序申请退款参数:{}", JSONObject.toJSONString(orderRefundParam));
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  |          List<OrderRefundSku> orderRefundSkuList = orderRefundParam.getOrderRefundSkuList();
 | 
	
		
			
				|  |  |          CullenUtils.validateDataThrowException(orderRefundSkuList.isEmpty(),"退款商品不能为空...");
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  |          String userId = SecurityUtils.getUser().getUserId();
 | 
	
		
			
				|  |  |          // 获取订单信息
 | 
	
		
			
				|  |  |          Order order = orderService.getOrderByOrderNumberAndUserId(orderRefundParam.getOrderNumber(), userId, true);
 | 
	
	
		
			
				|  | @@ -324,7 +321,9 @@ public class OrderRefundController {
 | 
	
		
			
				|  |  |              throw new GlobalException("当前订单已确认收货超过" + Constant.MAX_FINALLY_REFUND_TIME + "天,无法退款");
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -        if (Objects.equals(orderRefundParam.getRefundType(), RefundType.ALL.value()) && (!Objects.isNull(order.getRefundStatus()) && !Objects.equals(order.getRefundStatus(), RefundStatusEnum.DISAGREE.value()))) {
 | 
	
		
			
				|  |  | +        if (Objects.equals(orderRefundParam.getRefundType(), RefundType.ALL.value())
 | 
	
		
			
				|  |  | +                && (!Objects.isNull(order.getRefundStatus())
 | 
	
		
			
				|  |  | +                && !Objects.equals(order.getRefundStatus(), RefundStatusEnum.DISAGREE.value()))) {
 | 
	
		
			
				|  |  |              throw new GlobalException("该订单已有商品正在退款中,不能再进行整单退款");
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  |  
 |