自动截拍时间倒序

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/SysSpecialPerformanceServiceImpl.java

@@ -126,6 +126,9 @@ public class SysSpecialPerformanceServiceImpl implements SysSpecialPerformanceSe
             PageInfo pageInfo = new PageInfo(list);
             long itemNum = pageInfo.getTotal();
             List<SupplierItemVo> supplierItemVos = new ArrayList<>();
+            Date now = new Date();
+            Instant startInstant = now.toInstant().plus(Duration.ofDays(1));
+            Date previewStartTime = Date.from(startInstant);
             for (SpecialPerformanceConfig specialPerformanceConfig : list) {
                 SupplierItem supplierItem = supplierItemDao.findById(specialPerformanceConfig.getItemId());
                 SupplierItemVo supplierItemVo = new SupplierItemVo();
@@ -145,6 +148,20 @@ public class SysSpecialPerformanceServiceImpl implements SysSpecialPerformanceSe
                     supplierItemVo.setAddExtent(PriceUtil.convertPriceFenToYuan(auctionConfig.getAddExtent()));
                     supplierItemVo.setAuctionState(auctionConfig.getState());
                     supplierItemVo.setAuctionStateName(AuctionEnum.StateEnum.getNameByCode(auctionConfig.getState()));
+                    if (previewStartTime.after(auctionConfig.getStartTime()) && auctionConfig.getStartTime().after(now)) {
+                        supplierItemVo.setAuctionState(AuctionEnum.StateEnum.PREVIEW.getCode());
+                        supplierItemVo.setAuctionStateName(AuctionEnum.StateEnum.PREVIEW.getDes());
+                    } else if (auctionConfig.getStartTime().before(now) && auctionConfig.getRealEndTime().after(now)) {
+                        supplierItemVo.setAuctionState(AuctionEnum.StateEnum.AUCTIONING.getCode());
+                        supplierItemVo.setAuctionStateName(AuctionEnum.StateEnum.AUCTIONING.getDes());
+                    } else if (now.after(auctionConfig.getRealEndTime())) {
+                        supplierItemVo.setAuctionState(AuctionEnum.StateEnum.END.getCode());
+                        supplierItemVo.setAuctionStateName(AuctionEnum.StateEnum.END.getDes());
+                        //如果当前时间已经超过截拍时间，并且竞拍配置还未改成无效，则进行修改
+                        if (auctionConfig.getIsValid()) {
+                            auctionConfigDao.setEnd(supplierItem.getId());
+                        }
+                    }
                     supplierItemVo.setEstimatedPrice(PriceUtil.convertPriceFenToYuan(auctionConfig.getEstimatedPrice()));
                 }
                 supplierItemVos.add(supplierItemVo);
@@ -298,7 +315,7 @@ public class SysSpecialPerformanceServiceImpl implements SysSpecialPerformanceSe
                 intervalSecond = (int)(specialPerformance.getItemEndInterval() * 60);
             }
             List<SpecialPerformanceConfig> specialPerformanceConfigList = specialPerformanceConfigDao.findAllItem(dto.getSpecialPerformanceId());
-            specialPerformanceConfigList.stream().sorted(Comparator.comparing(SpecialPerformanceConfig::getLot).reversed());
+            specialPerformanceConfigList = specialPerformanceConfigList.stream().sorted(Comparator.comparing(SpecialPerformanceConfig::getLot).reversed()).collect(Collectors.toList());
             Date specialPerformanceStartTime = specialPerformance.getStartTime();
             Date specialPerformanceEndTime = specialPerformance.getEndTime();
             for (int i = 0; i < specialPerformanceConfigList.size(); i++) {