type大小写 判断状态用已退款金额 用number不退全款有问题

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinOrderRefundsServiceImpl.java

@@ -250,7 +250,7 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
             case "approved":
                 res = kylinRefundsStatusServiceImpl.orderRefundChangeStatus(refundList, type, reject, "");
                 break;
-            case "Reject":
+            case "reject":
                 res = kylinRefundsStatusServiceImpl.orderRefundChangeStatus(refundList, type, reject, "");
                 break;
             case "unfilled":
@@ -369,8 +369,9 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
                 new QueryWrapper<KylinPerformances>().eq("performances_id", kylinOrderTicketRelations.getPerformanceId())
         );
 
-        List<KylinOrderTicketEntitiesDao> entitiesList = kylinOrderTicketEntitiesMapper.getRefundEntitiesList(kylinOrderTickets.getOrderTicketsId());
-        if(entitiesList.size() > 0) {
+        List<KylinOrderTicketEntitiesDao> entitiesListTemp = kylinOrderTicketEntitiesMapper.getRefundEntitiesList(kylinOrderTickets.getOrderTicketsId());
+        List<KylinOrderTicketEntitiesDao> entitiesList = new ArrayList<>();
+        if(entitiesListTemp.size() > 0) {
             double priceActual = kylinOrderTickets.getPriceActual().doubleValue();
             double priceExpress = kylinOrderTickets.getPriceExpress().doubleValue();
             int allEntitiesCount = kylinOrderTicketEntitiesMapper.selectCount(// 总入场人数量 排出未付款的 用来计算单入场人的价格
@@ -379,7 +380,7 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
                             .ne("is_payment", KylinTableStatusConst.ENTITIES_IS_PAYMENT0)
             );
             double onePrice = (priceActual - priceExpress) / allEntitiesCount;//单价
-            for (KylinOrderTicketEntitiesDao entities : entitiesList) {
+            for (KylinOrderTicketEntitiesDao entities : entitiesListTemp) {
                 Double refundedPrice = kylinOrderTicketEntitiesMapper.getRefundEntitiesPrice(//已退 包含退款中
                         kylinOrderTickets.getOrderTicketsId(),
                         KylinTableStatusConst.ORDER_REFUND_STATUS_CANCEL,
@@ -392,6 +393,9 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
                     canRefundedPrice = onePrice;
                 }
                 entities.setCanRefundedPrice(BigDecimal.valueOf(canRefundedPrice));
+                if (canRefundedPrice > 0) { // 退款中但是可退款金额为0不展示
+                    entitiesList.add(entities);
+                }
             }
         }
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinRefundsStatusServiceImpl.java

@@ -206,7 +206,7 @@ public class KylinRefundsStatusServiceImpl {
                 KylinOrderTickets orderInfo = kylinOrderTicketsMapper.selectOne(
                         new QueryWrapper<KylinOrderTickets>().eq("order_tickets_id", orderTicketsId)
                 );
-                if (orderInfo.getRefundNumber() > 0) { // 已经有退完的 那就是部分退款了
+                if (orderInfo.getPriceRefund().doubleValue() > 0) { // 已经有退完的 那就是部分退款了
                     newStatus = KylinTableStatusConst.ORDER_STATUS6;
                 } else {
                     newStatus = KylinTableStatusConst.ORDER_STATUS1;
@@ -298,7 +298,7 @@ public class KylinRefundsStatusServiceImpl {
                 kylinOrderRefunds.setAuditorAt(LocalDateTime.now());
                 kylinOrderRefunds.setReject(reject);
                 break;
-            case "Reject":
+            case "reject":
                 kylinOrderRefunds.setStatus(KylinTableStatusConst.ORDER_REFUND_STATUS_REJECT);
                 kylinOrderRefunds.setAuditorId(authId);
                 kylinOrderRefunds.setAuditorName(authName);