zoujiajian 1 년 전
부모
커밋
68a471b1d6
1개의 변경된 파일6개의 추가작업 그리고 6개의 파일을 삭제
  1. 6 6
      netflix-service/src/main/java/com/cyksj/service/mange/impl/CmsOrderDonServiceImpl.java

+ 6 - 6
netflix-service/src/main/java/com/cyksj/service/mange/impl/CmsOrderDonServiceImpl.java

@@ -593,9 +593,9 @@ public class CmsOrderDonServiceImpl extends ServiceImpl<OrderDonMapper,OrderDon>
         BigDecimal orderDonRefundMoney = Optional.ofNullable(orderDon.getRefundMoney()).orElse(BigDecimal.ZERO);
         BigDecimal orderDonRefundBalance = Optional.ofNullable(orderDon.getRefundBalance()).orElse(BigDecimal.ZERO);
         String refundType = refundReq.getRefundType();
-        if (orderDon.getType() == UpgradeOrderDon.Type.BALANCE && !UpgradeOrderDon.Type.BALANCE.getType().equals(refundType)) {
-            throw BusinessRuntimeException.getInstance("余额支付的订单不支持金额退款");
-        }
+//        if (orderDon.getType() == UpgradeOrderDon.Type.BALANCE && !UpgradeOrderDon.Type.BALANCE.getType().equals(refundType)) {
+//            throw BusinessRuntimeException.getInstance("余额支付的订单不支持金额退款");
+//        }
         if (UpgradeOrderDon.Status.refund == orderDon.getStatus()) {
             throw BusinessRuntimeException.getInstance("该订单已退款");
         }
@@ -926,9 +926,9 @@ public class CmsOrderDonServiceImpl extends ServiceImpl<OrderDonMapper,OrderDon>
         BigDecimal orderDonRefundMoney = Optional.ofNullable(orderDon.getRefundMoney()).orElse(BigDecimal.ZERO);
         BigDecimal orderDonRefundBalance = Optional.ofNullable(orderDon.getRefundBalance()).orElse(BigDecimal.ZERO);
         String refundType = refundReq.getRefundType();
-        if (orderDon.getType() == OrderDon.Type.BALANCE && !OrderDon.Type.BALANCE.getType().equals(refundType)) {
-            throw BusinessRuntimeException.getInstance("余额支付的订单不支持金额退款");
-        }
+//        if (orderDon.getType() == OrderDon.Type.BALANCE && !OrderDon.Type.BALANCE.getType().equals(refundType)) {
+//            throw BusinessRuntimeException.getInstance("余额支付的订单不支持金额退款");
+//        }
         if (OrderDon.Status.refund == orderDon.getStatus()) {
             throw BusinessRuntimeException.getInstance("该订单已退款");
         }