修改退款

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

@@ -474,16 +474,25 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                 // 订单状态表 判断是退到正在退款 已付款 部分退款？(取消，完成，失败)
                 int newIsPayment = 0;
                 int refundingEntitiesCount = 0;
+                BigDecimal entitiesAllPrice = BigDecimal.valueOf(0);
                 for (KylinOrderRefundsVo item2 : orderRefundsVoList) {
                     int status = item2.getStatus();
-                    if (!item2.getOrderRefundsId().equals(orderRefundsId) && (status != 2 && status != 4  && status != 5 && status != 6)) {
+                    if (!item2.getOrderRefundsId().equals(orderRefundsId) && (status != 2 && status != 4 && status != 5 && status != 6)) {
                         for (KylinOrderRefundEntitiesVo item3 : item2.getOrderRefundEntitiesVoList()) {
                             if (item3.getOrderTicketEntitiesId().equals(item.getOrderTicketEntitiesId())) {
                                 refundingEntitiesCount += 1;
                             }
                         }
                     }
+
+                    for (KylinOrderRefundEntitiesVo item3 : item2.getOrderRefundEntitiesVoList()) {
+                        if (item3.getOrderTicketEntitiesId().equals(item.getOrderTicketEntitiesId())) {
+                            entitiesAllPrice.add(item3.getRefundPrice());
+                        }
+                    }
+
                 }
+
                 KylinOrderTicketEntitiesVo entitiesVo = null;
                 for (KylinOrderTicketEntitiesVo entitiesVo1 : orderTicketVo.getEntitiesVoList()) {
                     if (entitiesVo1.getOrderTicketEntitiesId().equals(item.getOrderTicketEntitiesId())) {
@@ -491,10 +500,11 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                         break;
                     }
                 }
+
                 if (refundingEntitiesCount > 0) { // 存在其他正在退款的该入场人订单
                     newIsPayment = KylinTableStatusConst.ENTITIES_IS_PAYMENT2;
                 } else {
-                    if (entitiesVo.getRefundPrice().doubleValue() > 0) { // 已经有退完的 那就是部分退款了
+                    if (entitiesAllPrice.subtract(entitiesVo.getRefundPrice()).doubleValue() > 0) { // 已经有退完的 那就是部分退款了
                         newIsPayment = KylinTableStatusConst.ENTITIES_IS_PAYMENT4;
                     } else {
                         newIsPayment = KylinTableStatusConst.ENTITIES_IS_PAYMENT1;