isRefundExpressNew 判断

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

@@ -129,17 +129,19 @@ public class KylinOrderTicketsRefundServiceImpl {
             // 快递费 判断是否是最后一张入场人票 减去已经退的快递费
             BigDecimal canRefundPriceExpress = BigDecimal.valueOf(0);
             // 正在和已经退的快递票金额 正在和已经退的票数量
-            Integer refundNum = 0;
-            BigDecimal priceExpressOld = BigDecimal.valueOf(0);
-            for (KylinOrderRefundsVo refundVo : kylinOrderRefundsVoBaseList) {
-                int status = refundVo.getStatus();
-                if (status != KylinTableStatusConst.ORDER_REFUND_STATUS_CANCEL && status != KylinTableStatusConst.ORDER_REFUND_STATUS_REJECT) { //退款流程未完成和已完成的
-                    refundNum ++;
-                    priceExpressOld = priceExpressOld.add(refundVo.getPriceExpress());
+            if (performanceVo.getIsRefundExpressNew() == 1) {
+                Integer refundNum = 0;
+                BigDecimal priceExpressOld = BigDecimal.valueOf(0);
+                for (KylinOrderRefundsVo refundVo : kylinOrderRefundsVoBaseList) {
+                    int status = refundVo.getStatus();
+                    if (status != KylinTableStatusConst.ORDER_REFUND_STATUS_CANCEL && status != KylinTableStatusConst.ORDER_REFUND_STATUS_REJECT) { //退款流程未完成和已完成的
+                        refundNum ++;
+                        priceExpressOld = priceExpressOld.add(refundVo.getPriceExpress());
+                    }
+                }
+                if (refundNum + 1 == orderTicketVo.getNumber()) {
+                    canRefundPriceExpress = orderTicketVo.getPriceExpress().subtract(priceExpressOld);
                 }
-            }
-            if (refundNum + 1 == orderTicketVo.getNumber()) {
-                canRefundPriceExpress = orderTicketVo.getPriceExpress().subtract(priceExpressOld);
             }
             // 整理返回数据
             BeanUtils.copyProperties(orderTicketVo, vo);
@@ -236,17 +238,19 @@ public class KylinOrderTicketsRefundServiceImpl {
             // 快递费 判断是否是最后一张入场人票 减去已经退的快递费
             BigDecimal priceExpress = BigDecimal.valueOf(0);
             // 正在和已经退的快递票金额 正在和已经退的票数量
-            Integer refundNum = 0;
-            BigDecimal priceExpressOld = BigDecimal.valueOf(0);
-            for (KylinOrderRefundsVo refundVo : kylinOrderRefundsVoBaseList) {
-                int status = refundVo.getStatus();
-                if (status != KylinTableStatusConst.ORDER_REFUND_STATUS_CANCEL && status != KylinTableStatusConst.ORDER_REFUND_STATUS_REJECT) { //退款流程未完成和已完成的
-                    refundNum ++;
-                    priceExpressOld = priceExpressOld.add(refundVo.getPriceExpress());
+            if (performanceVo.getIsRefundExpressNew() == 1) {
+                Integer refundNum = 0;
+                BigDecimal priceExpressOld = BigDecimal.valueOf(0);
+                for (KylinOrderRefundsVo refundVo : kylinOrderRefundsVoBaseList) {
+                    int status = refundVo.getStatus();
+                    if (status != KylinTableStatusConst.ORDER_REFUND_STATUS_CANCEL && status != KylinTableStatusConst.ORDER_REFUND_STATUS_REJECT) { //退款流程未完成和已完成的
+                        refundNum ++;
+                        priceExpressOld = priceExpressOld.add(refundVo.getPriceExpress());
+                    }
+                }
+                if (refundNum + 1 == orderTicketVo.getNumber()) {
+                    priceExpress = orderTicketVo.getPriceExpress().subtract(priceExpressOld);
                 }
-            }
-            if (refundNum + 1 == orderTicketVo.getNumber()) {
-                priceExpress = orderTicketVo.getPriceExpress().subtract(priceExpressOld);
             }
 
             Map token = CurrentUtil.getTokenClaims();