拍品详情状态

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

@@ -215,7 +215,7 @@ public class SpecialPerformanceServiceImpl implements SpecialPerformanceService
                     if (startTime.before(auctionConfig.getStartTime()) && auctionConfig.getStartTime().after(now)) {
                         supplierItemVo.setState(AuctionEnum.StateEnum.PREVIEW.getCode());
                         supplierItemVo.setStateName(AuctionEnum.StateEnum.PREVIEW.getDes());
-                    } else if (auctionConfig.getStartTime().before(now) && auctionConfig.getEndTime().after(now)) {
+                    } else if (auctionConfig.getStartTime().before(now) && auctionConfig.getRealEndTime().after(now)) {
                         supplierItemVo.setState(AuctionEnum.StateEnum.AUCTIONING.getCode());
                         supplierItemVo.setStateName(AuctionEnum.StateEnum.AUCTIONING.getDes());
                     } else if (now.after(auctionConfig.getRealEndTime())) {
@@ -240,14 +240,14 @@ public class SpecialPerformanceServiceImpl implements SpecialPerformanceService
             if (now.after(specialPerformance.getEndTime())) {
                 SpecialPerformance updateDto = new SpecialPerformance();
                 updateDto.setId(dto.getSpecialPerformanceId());
-                updateDto.setState(DistributionEnum.AuctionStateEnum.END.getCode());
+                updateDto.setState(SpecialPerformanceEnum.StateEnum.END.getCode());
                 updateDto.setUpdateTime(now);
                 specialPerformanceDao.update(updateDto);
-                resultMap.put("state", DistributionEnum.AuctionStateEnum.END.getCode());
-                resultMap.put("stateName", DistributionEnum.AuctionStateEnum.END.getDes());
+                resultMap.put("state", SpecialPerformanceEnum.StateEnum.END.getCode());
+                resultMap.put("stateName", SpecialPerformanceEnum.StateEnum.END.getDes());
             } else {
                 resultMap.put("state", specialPerformance.getState());
-                resultMap.put("stateName", DistributionEnum.AuctionStateEnum.getNameByCode(specialPerformance.getState()));
+                resultMap.put("stateName", SpecialPerformanceEnum.StateEnum.getNameByCode(specialPerformance.getState()));
             }
             return Result.success(resultMap);
         } catch (Exception e) {

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

@@ -616,7 +616,7 @@ public class SupplierItemServiceImpl implements SupplierItemService {
             if (previewStartTime.before(auctionConfig.getStartTime()) && auctionConfig.getStartTime().after(now)) {
                 auctionDetailVo.setState(AuctionEnum.StateEnum.PREVIEW.getCode());
                 auctionDetailVo.setStateName(AuctionEnum.StateEnum.PREVIEW.getDes());
-            } else if (auctionConfig.getStartTime().before(now) && auctionConfig.getEndTime().after(now)) {
+            } else if (auctionConfig.getStartTime().before(now) && auctionConfig.getRealEndTime().after(now)) {
                 auctionDetailVo.setState(AuctionEnum.StateEnum.AUCTIONING.getCode());
                 auctionDetailVo.setStateName(AuctionEnum.StateEnum.AUCTIONING.getDes());
             } else if (now.after(realEndTime)) {

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

@@ -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().before(now) && auctionConfig.getEndTime().after(now)) {
+                        } else if (auctionConfig.getStartTime().before(now) && auctionConfig.getRealEndTime().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().before(now) && specialPerformance.getEndTime().after(now)) {
+                        if (auctionConfig.getStartTime().before(now) && auctionConfig.getRealEndTime().after(now)) {
                             //开始时间之后，结束时间之前，状态设置为进行中
                             if (auctionConfig.getState().intValue() != AuctionEnum.StateEnum.AUCTIONING.getCode()) {
                                 auctionConfigDao.updateState(itemId, AuctionEnum.StateEnum.AUCTIONING.getCode());