小程序首页展示预览中专场

ch-dao/src/main/java/com/wwdz/ch/db/dao/distribution/SpecialPerformanceDao.java

@@ -9,7 +9,7 @@ public interface SpecialPerformanceDao {
 
     List<SpecialPerformance> find(SpecialPerformanceRequestDto dto);
 
-    SpecialPerformance findByType(int type);
+    SpecialPerformance findByType(SpecialPerformanceRequestDto dto);
 
     SpecialPerformance findById(int id);
 

ch-dao/src/main/java/com/wwdz/ch/db/dto/request/distribution/SpecialPerformanceRequestDto.java

@@ -5,6 +5,7 @@ import com.xxdxxs.entity.Entity;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 @Data
 public class SpecialPerformanceRequestDto extends BaseRequestDto implements Entity {
@@ -57,6 +58,8 @@ public class SpecialPerformanceRequestDto extends BaseRequestDto implements Enti
      */
     private Integer state;
 
+    private List<Integer> stateList;
+
     /**
      * 排除的状态
      */

ch-dao/src/main/java/com/wwdz/ch/db/impl/distribution/SpecialPerformanceDaoImpl.java

@@ -35,11 +35,11 @@ public class SpecialPerformanceDaoImpl implements SpecialPerformanceDao {
     }
 
     @Override
-    public SpecialPerformance findByType(int type) {
+    public SpecialPerformance findByType(SpecialPerformanceRequestDto dto) {
         SpecialPerformanceExample example = new SpecialPerformanceExample();
         SpecialPerformanceExample.Criteria criteria = example.createCriteria();
-        criteria.andTypeEqualTo(type);
-        criteria.andStateEqualTo(2);
+        criteria.andTypeEqualTo(dto.getType());
+        JdbcHelper.ifPresent(dto.getStateList(), criteria::andStateIn);
         return specialPerformanceMapper.selectOneByExample(example);
     }
 

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

@@ -94,7 +94,8 @@ public class SpecialPerformanceServiceImpl implements SpecialPerformanceService
             }
 
             SpecialPerformanceVo specialPerformanceVo = new SpecialPerformanceVo();
-            SpecialPerformance specialPerformance = specialPerformanceDao.findByType(dto.getType());
+            dto.setStateList(Arrays.asList(SpecialPerformanceEnum.StateEnum.PREVIEW.getCode(), SpecialPerformanceEnum.StateEnum.PROCESSING.getCode()));
+            SpecialPerformance specialPerformance = specialPerformanceDao.findByType(dto);
             if (specialPerformance == null) {
                 return Result.success(specialPerformanceVo);
             }
@@ -252,7 +253,10 @@ public class SpecialPerformanceServiceImpl implements SpecialPerformanceService
     @Override
     public Result sendMsg() {
         try {
-            SpecialPerformance specialPerformance = specialPerformanceDao.findByType(SpecialPerformanceEnum.TypeEnum.AUCTION.getCode());
+            SpecialPerformanceRequestDto specialPerformanceRequestDto = new SpecialPerformanceRequestDto();
+            specialPerformanceRequestDto.setType(SpecialPerformanceEnum.TypeEnum.AUCTION.getCode());
+            specialPerformanceRequestDto.setState(SpecialPerformanceEnum.StateEnum.PROCESSING.getCode());
+            SpecialPerformance specialPerformance = specialPerformanceDao.findByType(specialPerformanceRequestDto);
             if (specialPerformance == null) {
                 return Result.failed("专场信息为空");
             }

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

@@ -164,7 +164,7 @@ public class SpecialPerformanceNoticeJob {
             specialPerformanceRequestDto.setFilterState(SpecialPerformanceEnum.StateEnum.END.getCode());
             List<SpecialPerformance> specialPerformanceList = specialPerformanceDao.find(specialPerformanceRequestDto);
             Date now = new Date();
-            Instant startInstant = now.toInstant().minus(Duration.ofDays(1));
+            Instant startInstant = now.toInstant().plus(Duration.ofDays(1));
             Date startTime = Date.from(startInstant);
             for (SpecialPerformance specialPerformance : specialPerformanceList) {
                 if (specialPerformance.getState().intValue() == SpecialPerformanceEnum.StateEnum.DELETED.getCode()) {
@@ -172,7 +172,7 @@ public class SpecialPerformanceNoticeJob {
                 } else if (specialPerformance.getState().intValue() == SpecialPerformanceEnum.StateEnum.NOT_START.getCode()) {
                     //未开始的专场判断是否需要改为预展中，开始时间提前一天预展
                     //设置为预展中
-                    if (now.after(specialPerformance.getStartTime()) && specialPerformance.getStartTime().after(startTime)) {
+                    if (startTime.after(specialPerformance.getStartTime()) && specialPerformance.getStartTime().after(now)) {
                         if (specialPerformance.getState().intValue() != SpecialPerformanceEnum.StateEnum.PREVIEW.getCode()) {
                             specialPerformanceDao.updateState(specialPerformance.getId(), SpecialPerformanceEnum.StateEnum.PREVIEW.getCode());
                         }