Merge branch 'master-zjw' into dev

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/OrderRefundController.java

@@ -157,12 +157,11 @@ public class OrderRefundController extends BaseController<OrderRefundBiz,OrderRe
         orpv.setRealAmount(orderPageVO.getRealAmount());
         orpv.setRefundAmount(totalRefundAmount);
         if(orderPageVO.getStatus().equals(OrderStatusEnum.ORDER_UNPAY.getCode())
-                || orderPageVO.getStatus().equals(OrderStatusEnum.ORDER_CRT.getCode())) {
+                || orderPageVO.getStatus().equals(OrderStatusEnum.ORDER_CRT.getCode())
+                || totalDeductAmount.compareTo(BigDecimal.ZERO) <= 0) {
             orpv.setRefundDesc("是否确定取消订单");
-        }else if(totalDeductAmount.compareTo(BigDecimal.ZERO) > 0) {
-            orpv.setRefundDesc(StrUtil.format("本次取消操作需要扣除{}元违约金，实际退款金额为{}元，您确定要取消订单吗？", totalDeductAmount, totalRefundAmount));
         }else {
-            orpv.setRefundDesc("取消操作可能会产生额外费用，是否确定取消订单");
+            orpv.setRefundDesc(StrUtil.format("本次取消操作需要扣除{}元违约金，实际退款金额为{}元，您确定要取消订单吗？", totalDeductAmount, totalRefundAmount));
         }
         return ObjectRestResponse.succ(orpv);
     }