快递费计算要处理退款中的

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

@@ -217,8 +217,18 @@ public class KylinOrderTicketsRefundServiceImpl {
 
             // 快递费 判断是否是最后一张入场人票 减去已经退的快递费
             BigDecimal priceExpress = BigDecimal.valueOf(0);
-            if (orderTicketVo.getRefundNumber() + 1 == orderTicketVo.getNumber()) {
-                priceExpress = orderTicketVo.getPriceExpress().subtract(dataUtils.getCanRefundPriceExpress(kylinOrderRefundsVoBaseList));
+            // 正在和已经退的快递票金额 正在和已经退的票数量
+            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);
             }
 
             Map token = CurrentUtil.getTokenClaims();

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

@@ -298,7 +298,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                     data.setPrice(item.getPrice());
                     data.setIsMine(uid.equals(item.getApplicantId()) ? 1 : 0);
                     if (item.getStatus().equals(0) || item.getStatus().equals(1) || item.getStatus().equals(7) || item.getStatus().equals(3) || item.getStatus().equals(4)) {
-                        lockPrice = lockPrice.add(item.getPrice());
+                        lockPrice = lockPrice.add(item.getPrice()).add(item.getPriceExpress());
                     }
                     orderRefundListVos.add(data);
                 }