退款 时间配置 不能为空

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/KylinOrderTicketEntitiesPreRefundVo.java

@@ -21,4 +21,5 @@ public class KylinOrderTicketEntitiesPreRefundVo implements Serializable, Clonea
     private BigDecimal priceActual;
     private BigDecimal priceCanRefund;
     private String ticketTitle;
+    private Integer isPayment;
 }

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

@@ -624,6 +624,7 @@ public class DataUtils {
                 canRefundSinglePrice = singlePrice.subtract(item.getRefundPrice()==null?BigDecimal.valueOf(0.00):item.getRefundPrice());
             }
         }
+        System.out.println("单票剩余未退款金额 : "+canRefundSinglePrice);
         //订单锁定金额
         BigDecimal orderLockPrice = new BigDecimal("0.00");
         for (KylinOrderRefundsVo refundVo : kylinOrderRefundsVoBaseList) {
@@ -637,8 +638,10 @@ public class DataUtils {
                 }
             }
         }
+        System.out.println("订单锁定金额 : "+orderLockPrice);
         //订单可退金额
         BigDecimal refundSinglePrice = canRefundSinglePrice.subtract(orderLockPrice);
+        System.out.println("订单可退金额 : "+refundSinglePrice);
         //是否包含快递费
         if (orderTicketVo.getPriceActual().subtract(orderTicketVo.getPriceExpress()).subtract(orderTicketVo.getPriceRefund()).compareTo(canRefundSinglePrice) == 0) {
             refundSinglePrice = refundSinglePrice.add(orderTicketVo.getPriceExpress());