拍卖中标签查询商品返回倒计时,自动刷新专场状态

ch-core/src/main/java/com/wwdz/ch/core/entity/SupplierItemVo.java

@@ -146,6 +146,7 @@ public class SupplierItemVo implements Entity {
      */
     private Date auctionEndTime;
 
+
     /**
      * 实际竞拍结束时间
      */

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/CollectionItemsRelationServiceImpl.java

@@ -241,7 +241,7 @@ public class CollectionItemsRelationServiceImpl implements CollectionItemsRelati
                 if (dto.getCollectionBookId().longValue() == CollectionBookConstants.DefaultBookEnum.AUCTIONING.getId()){
                     List<AuctionConfig> auctionConfigList = pageInfo.getList();
                     Map<Long, Date> map = auctionConfigList.stream().collect(Collectors.toMap(AuctionConfig::getItemId, AuctionConfig::getRealEndTime , (k1, k2) ->k2));
-                    supplierItemVo.setAuctionEndTime(map.get(supplierItem.getId()));
+                    supplierItemVo.setRealEndTime(map.get(supplierItem.getId()));
                 }
                 list.add(supplierItemVo);
             }

ch-wx-api/src/main/java/com/wwdz/ch/wx/job/SpecialPerformanceNoticeJob.java

@@ -172,18 +172,18 @@ public class SpecialPerformanceNoticeJob {
                 } else if (specialPerformance.getState().intValue() == SpecialPerformanceEnum.StateEnum.NOT_START.getCode()) {
                     //未开始的专场判断是否需要改为预展中，开始时间提前一天预展
                     //设置为预展中
-                    if (specialPerformance.getStartTime().after(startTime) && specialPerformance.getStartTime().before(now)) {
+                    if (now.after(specialPerformance.getStartTime()) && specialPerformance.getStartTime().after(startTime)) {
                         if (specialPerformance.getState().intValue() != SpecialPerformanceEnum.StateEnum.PREVIEW.getCode()) {
                             specialPerformanceDao.updateState(specialPerformance.getId(), SpecialPerformanceEnum.StateEnum.PREVIEW.getCode());
                         }
-                    } else if (specialPerformance.getStartTime().after(now) && specialPerformance.getEndTime().after(now)) {
+                    } else if (specialPerformance.getStartTime().before(now) && specialPerformance.getEndTime().after(now)) {
                         //开始时间之后，结束时间之前，状态设置为进行中
                         if (specialPerformance.getState().intValue() != SpecialPerformanceEnum.StateEnum.PROCESSING.getCode()) {
                             specialPerformanceDao.updateState(specialPerformance.getId(), SpecialPerformanceEnum.StateEnum.PROCESSING.getCode());
                         }
                     }
                 } else if (specialPerformance.getState().intValue() == SpecialPerformanceEnum.StateEnum.PREVIEW.getCode()) {
-                    if (specialPerformance.getStartTime().after(now) && specialPerformance.getEndTime().after(now)) {
+                    if (specialPerformance.getStartTime().before(now) && specialPerformance.getEndTime().after(now)) {
                         //开始时间之后，结束时间之前，状态设置为进行中
                         if (specialPerformance.getState().intValue() != SpecialPerformanceEnum.StateEnum.PROCESSING.getCode()) {
                             specialPerformanceDao.updateState(specialPerformance.getId(), SpecialPerformanceEnum.StateEnum.PROCESSING.getCode());
@@ -209,14 +209,14 @@ public class SpecialPerformanceNoticeJob {
                             if (auctionConfig.getState().intValue() != AuctionEnum.StateEnum.PREVIEW.getCode()) {
                                 auctionConfigDao.updateState(itemId, AuctionEnum.StateEnum.PREVIEW.getCode());
                             }
-                        } else if (auctionConfig.getStartTime().after(now) && auctionConfig.getEndTime().after(now)) {
+                        } else if (auctionConfig.getStartTime().before(now) && auctionConfig.getEndTime().after(now)) {
                             //开始时间之后，结束时间之前，状态设置为拍卖中
                             if (auctionConfig.getState().intValue() != AuctionEnum.StateEnum.AUCTIONING.getCode()) {
                                 auctionConfigDao.updateState(itemId, AuctionEnum.StateEnum.AUCTIONING.getCode());
                             }
                         }
                     } else if (auctionConfig.getState().intValue() == AuctionEnum.StateEnum.PREVIEW.getCode()) {
-                        if (auctionConfig.getStartTime().after(now) && specialPerformance.getEndTime().after(now)) {
+                        if (auctionConfig.getStartTime().before(now) && specialPerformance.getEndTime().after(now)) {
                             //开始时间之后，结束时间之前，状态设置为进行中
                             if (auctionConfig.getState().intValue() != AuctionEnum.StateEnum.AUCTIONING.getCode()) {
                                 auctionConfigDao.updateState(itemId, AuctionEnum.StateEnum.AUCTIONING.getCode());