isRefundExpressNew 判断

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

@@ -129,6 +129,7 @@ public class KylinOrderTicketsRefundServiceImpl {
             // 快递费 判断是否是最后一张入场人票 减去已经退的快递费
             BigDecimal canRefundPriceExpress = BigDecimal.valueOf(0);
             // 正在和已经退的快递票金额 正在和已经退的票数量
+            if (performanceVo.getIsRefundExpressNew() == 1) {
                 Integer refundNum = 0;
                 BigDecimal priceExpressOld = BigDecimal.valueOf(0);
                 for (KylinOrderRefundsVo refundVo : kylinOrderRefundsVoBaseList) {
@@ -141,6 +142,7 @@ public class KylinOrderTicketsRefundServiceImpl {
                 if (refundNum + 1 == orderTicketVo.getNumber()) {
                     canRefundPriceExpress = orderTicketVo.getPriceExpress().subtract(priceExpressOld);
                 }
+            }
             // 整理返回数据
             BeanUtils.copyProperties(orderTicketVo, vo);
             vo.setIsRefundPoundage(performanceVo.getIsRefundPoundage());
@@ -236,6 +238,7 @@ public class KylinOrderTicketsRefundServiceImpl {
             // 快递费 判断是否是最后一张入场人票 减去已经退的快递费
             BigDecimal priceExpress = BigDecimal.valueOf(0);
             // 正在和已经退的快递票金额 正在和已经退的票数量
+            if (performanceVo.getIsRefundExpressNew() == 1) {
                 Integer refundNum = 0;
                 BigDecimal priceExpressOld = BigDecimal.valueOf(0);
                 for (KylinOrderRefundsVo refundVo : kylinOrderRefundsVoBaseList) {
@@ -248,6 +251,7 @@ public class KylinOrderTicketsRefundServiceImpl {
                 if (refundNum + 1 == orderTicketVo.getNumber()) {
                     priceExpress = orderTicketVo.getPriceExpress().subtract(priceExpressOld);
                 }
+            }
 
             Map token = CurrentUtil.getTokenClaims();
             String username = StringUtils.defaultString(((String) token.get("nickname")), "");