Merge branch 'quanku_v2.7' into quanku_v2.7.1

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

@@ -87,9 +87,15 @@ public class SysDistributionOrderServiceImpl implements SysDistributionOrderServ
                     return Result.success();
                 }
             }
-            if (dto.getType() == null) {
-                dto.setTypeList(Arrays.asList(DistributionEnum.DistributionTypeEnum.FIXED_PRICE.getCode(), DistributionEnum.DistributionTypeEnum.AUCTION.getCode()
-                        , DistributionEnum.DistributionTypeEnum.DISCOUNT.getCode()));
+            if (dto.getTypeStr() == null) {
+                dto.setTypeList(Arrays.asList(DistributionEnum.DistributionTypeEnum.FIXED_PRICE.getCode(), DistributionEnum.DistributionTypeEnum.DISCOUNT.getCode()));
+            } else {
+                String[] types = dto.getTypeStr().split(",");
+                List<Integer> typeList = new ArrayList<>();
+                for (String type : types) {
+                    typeList.add(Integer.valueOf(type));
+                }
+                dto.setTypeList(typeList);
             }
             List<DistributionOrder> distributionOrderList = distributionOrderDao.findByPage(dto);
             PageInfo pageInfo = new PageInfo<>(distributionOrderList);

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

@@ -129,7 +129,7 @@ public class SysSupplierItemServiceImpl implements SysSupplierItemService {
             if (dto.getType() == DistributionEnum.DistributionTypeEnum.AUCTION.getCode()) {
                 AuctionConfig auctionConfig = new AuctionConfig();
                 auctionConfig.setItemId(itemId);
-                auctionConfig.setCreatorId(CommConsts.SYSTEM_ACCOUNT);
+                auctionConfig.setCreatorId(supplierItem.getCreatorId());
                 auctionConfig.setIsValid(true);
                 auctionConfig.setIsDeal(false);
                 auctionConfig.setStartTime(DateUtils.parseString(dto.getAuctionStartTime()));

ch-core/src/main/java/com/wwdz/ch/core/consts/AuctionEnum.java

@@ -7,8 +7,9 @@ public class AuctionEnum {
      */
     public enum StateEnum {
         WAIT_ON_SALE(1, "待上架"),
+        AUCTIONING(2, "竞拍中"),
+        END(3, "已截拍"),
         PREVIEW(10, "预展中"),
-        AUCTIONING(20, "竞拍中"),
         GET_NOT_PAY(30, "中拍未付款"),
         GET_NOT_PAY_TO_PASS(40, "中拍未付款流拍"),
         NO_OFFER_TO_PASS(50, "无出价流拍"),

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

@@ -179,6 +179,8 @@ public class DistributionOrderRequestDto extends BaseRequestDto implements Entit
      */
     private Integer type;
 
+    private String typeStr;
+
     private List<Integer> typeList;
 
     /**

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

@@ -5,6 +5,7 @@ import com.xxdxxs.entity.Entity;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 @Data
 public class SpecialPerformanceConfigRequestDto extends BaseRequestDto implements Entity {
@@ -40,4 +41,9 @@ public class SpecialPerformanceConfigRequestDto extends BaseRequestDto implement
      * 状态
      */
     private Integer state;
+
+    /**
+     * 查询时排除的商品id
+     */
+    private List<Long> filterItemIdList;
 }

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

@@ -27,6 +27,7 @@ public class SpecialPerformanceConfigDaoImpl implements SpecialPerformanceConfig
         SpecialPerformanceConfigExample.Criteria criteria = example.createCriteria();
         JdbcHelper.ifPresent(dto.getSpecialPerformanceId(), criteria::andSpecialPerformanceIdEqualTo);
         JdbcHelper.ifPresent(dto.getItemId(), criteria::andItemIdEqualTo);
+        JdbcHelper.ifPresent(dto.getFilterItemIdList(), criteria::andItemIdNotIn);
         PageHelper.startPage(dto.getPage(), dto.getLimit());
         criteria.andStateEqualTo(1);
         return specialPerformanceConfigMapper.selectByExample(example);

ch-wx-api/src/main/java/com/wwdz/ch/wx/entity/vo/distribution/AuctionDetailVo.java

@@ -133,4 +133,9 @@ public class AuctionDetailVo implements Entity {
 
     private String creatorName;
 
+    /**
+     * 专场id
+     */
+    private Integer specialPerformanceId;
+
 }

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

@@ -26,6 +26,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 
@@ -55,6 +56,9 @@ public class CollectionItemsRelationServiceImpl implements CollectionItemsRelati
     @Autowired
     AuctionConfigDao auctionConfigDao;
 
+    @Autowired
+    AuctionRecordDao auctionRecordDao;
+
     @Override
     public Result create(CollectionItemsRelationRequestDto dto) {
         try {
@@ -240,8 +244,16 @@ public class CollectionItemsRelationServiceImpl implements CollectionItemsRelati
                 supplierItemVo.setHomePageImage(MediaUtil.getHomePageImage(supplierItem.getImages(), supplierItem.getVideos()));
                 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.setRealEndTime(map.get(supplierItem.getId()));
+                    Map<Long, AuctionConfig> map = auctionConfigList.stream().collect(Collectors.toMap(AuctionConfig::getItemId, Function.identity() , (k1, k2) ->k2));
+                    supplierItemVo.setRealEndTime(map.get(supplierItem.getId()).getRealEndTime());
+                    AuctionRecord auctionRecord = auctionRecordDao.findLastedRecord(supplierItem.getId());
+                    if (auctionRecord != null) {
+                        supplierItemVo.setCurrentPrice(PriceUtil.convertPriceFenToYuan(auctionRecord.getPrice()));
+                    } else {
+                        supplierItemVo.setCurrentPrice(PriceUtil.convertPriceFenToYuan(map.get(supplierItem.getId()).getStartPrice()));
+                    }
+                    supplierItemVo.setState(AuctionEnum.StateEnum.AUCTIONING.getCode());
+                    supplierItemVo.setStateName(AuctionEnum.StateEnum.AUCTIONING.getDes());
                 }
                 list.add(supplierItemVo);
             }

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

@@ -255,8 +255,8 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
                 distributionOrder.setDistributionOrderId(distributionOrderId);
                 distributionOrder.setBuyerId(auctionRecord.getUserId());
                 distributionOrder.setBuyerOpenid(auctionRecord.getUserOpenId());
-                distributionOrder.setShopId(firstAuctionRecord.getDistributorId());
-                distributionOrder.setSellerId(firstAuctionRecord.getDistributorId());
+                distributionOrder.setShopId(auctionConfig.getCreatorId());
+                distributionOrder.setSellerId(auctionConfig.getCreatorId());
                 distributionOrder.setAmount(auctionRecord.getPrice());
                 distributionOrder.setCreateTime(auctionConfig.getRealEndTime());
                 distributionOrder.setUpdateTime(now);
@@ -1034,8 +1034,8 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
                     dto.setDistributionOrderId(dto.getSearchParam());
                 }
             }
-            //查询分销订单
-            dto.setType(DistributionEnum.DistributionTypeEnum.COLLECT.getCode());
+            //查询藏家订单
+            dto.setTypeList(Arrays.asList(DistributionEnum.DistributionTypeEnum.AUCTION.getCode(), DistributionEnum.DistributionTypeEnum.COLLECT.getCode()));
             List<DistributionOrder> distributionOrderList = distributionOrderDao.findByPage(dto);
             PageInfo pageInfo = new PageInfo<>(distributionOrderList);
             for (DistributionOrder distributionOrder : distributionOrderList) {

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

@@ -2,6 +2,7 @@ package com.wwdz.ch.wx.impl.distribution;
 
 import com.github.pagehelper.PageInfo;
 import com.wwdz.ch.core.api.WxAppletApi;
+import com.wwdz.ch.core.consts.AuctionEnum;
 import com.wwdz.ch.core.consts.DistributionEnum;
 import com.wwdz.ch.core.consts.SpecialPerformanceEnum;
 import com.wwdz.ch.core.entity.SupplierItemVo;
@@ -16,10 +17,7 @@ import com.wwdz.ch.db.dao.distribution.*;
 import com.wwdz.ch.db.domain.User;
 import com.wwdz.ch.db.domain.distribution.*;
 import com.wwdz.ch.db.dto.request.UserRequestDto;
-import com.wwdz.ch.db.dto.request.distribution.AuctionRecordRequestDto;
-import com.wwdz.ch.db.dto.request.distribution.SpecialPerformanceConfigRequestDto;
-import com.wwdz.ch.db.dto.request.distribution.SpecialPerformanceRequestDto;
-import com.wwdz.ch.db.dto.request.distribution.SupplierItemRequestDto;
+import com.wwdz.ch.db.dto.request.distribution.*;
 import com.wwdz.ch.wx.entity.vo.distribution.SpecialPerformanceVo;
 import com.wwdz.ch.wx.service.distribution.SpecialPerformanceService;
 import com.xxdxxs.utils.DateUtils;
@@ -113,13 +111,22 @@ public class SpecialPerformanceServiceImpl implements SpecialPerformanceService
             specialPerformanceConfigRequestDto.setPage(dto.getPage());
             specialPerformanceConfigRequestDto.setLimit(dto.getLimit());
             specialPerformanceConfigRequestDto.setSpecialPerformanceId(specialPerformanceId);
+            //排除待上架的商品
+            AuctionConfigRequestDto auctionConfigRequestDto = new AuctionConfigRequestDto();
+            auctionConfigRequestDto.setState(AuctionEnum.StateEnum.WAIT_ON_SALE.getCode());
+            auctionConfigRequestDto.setLimit(9999);
+            List<AuctionConfig> auctionConfigList = auctionConfigDao.findList(auctionConfigRequestDto);
+            List<Long> filterItemIdList = auctionConfigList.stream().map(AuctionConfig::getItemId).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(filterItemIdList)) {
+                specialPerformanceConfigRequestDto.setFilterItemIdList(filterItemIdList);
+            }
             List<SpecialPerformanceConfig> list = specialPerformanceConfigDao.findList(specialPerformanceConfigRequestDto);
             PageInfo pageInfo = new PageInfo<>(list);
             specialPerformanceVo.setTotalItemNum(pageInfo.getTotal());
             specialPerformanceVo.setSpecialPerformanceId(specialPerformanceId);
             specialPerformanceVo.setTitle(specialPerformance.getTitle());
             specialPerformanceVo.setState(specialPerformance.getState());
-            specialPerformanceVo.setStateName(DistributionEnum.AuctionStateEnum.getNameByCode(specialPerformance.getState()));
+            specialPerformanceVo.setStateName(SpecialPerformanceEnum.StateEnum.getNameByCode(specialPerformance.getState()));
             specialPerformanceVo.setStartTime(specialPerformance.getStartTime());
             specialPerformanceVo.setEndTime(specialPerformance.getEndTime());
             long totalViewNum = specialPerformanceConfigDao.countViewNum(specialPerformanceId);
@@ -160,6 +167,15 @@ public class SpecialPerformanceServiceImpl implements SpecialPerformanceService
             specialPerformanceConfigRequestDto.setPage(dto.getPage());
             specialPerformanceConfigRequestDto.setLimit(dto.getLimit());
             specialPerformanceConfigRequestDto.setSpecialPerformanceId(dto.getSpecialPerformanceId());
+            //排除待上架的商品
+            AuctionConfigRequestDto auctionConfigRequestDto = new AuctionConfigRequestDto();
+            auctionConfigRequestDto.setState(AuctionEnum.StateEnum.WAIT_ON_SALE.getCode());
+            auctionConfigRequestDto.setLimit(9999);
+            List<AuctionConfig> auctionConfigList = auctionConfigDao.findList(auctionConfigRequestDto);
+            List<Long> filterItemIdList = auctionConfigList.stream().map(AuctionConfig::getItemId).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(filterItemIdList)) {
+                specialPerformanceConfigRequestDto.setFilterItemIdList(filterItemIdList);
+            }
             List<SpecialPerformanceConfig> list = specialPerformanceConfigDao.findList(specialPerformanceConfigRequestDto);
             PageInfo<SupplierItem> pageInfo = new PageInfo(list);
 
@@ -183,6 +199,10 @@ public class SpecialPerformanceServiceImpl implements SpecialPerformanceService
                 supplierItemRequestDto.setIds(itemList);
                 supplierItemList = supplierItemDao.findList(supplierItemRequestDto);
             }
+            Date now = new Date();
+            Instant startInstant = now.toInstant().plus(Duration.ofDays(1));
+            Date previewStartTime = Date.from(startInstant);
+
             supplierItemList.forEach(supplierItem -> {
                 SupplierItemVo supplierItemVo = new SupplierItemVo();
                 EntityMapper.copyAttribute(supplierItem, supplierItemVo);
@@ -195,7 +215,6 @@ public class SpecialPerformanceServiceImpl implements SpecialPerformanceService
                 supplierItemVo.setRebate(supplierItem.getRebate().toPlainString() + "%");
                 //竞拍商品需要展示当前价
                 if (supplierItem.getType() == DistributionEnum.DistributionTypeEnum.AUCTION.getCode()) {
-                    Date now = new Date();
                     AuctionRecord lastedRecord = auctionRecordDao.findLastedRecord(supplierItem.getId());
                     if (lastedRecord != null && lastedRecord.getPrice() != null) {
                         supplierItemVo.setCurrentPrice(PriceUtil.convertPriceFenToYuan(lastedRecord.getPrice()));
@@ -203,20 +222,24 @@ public class SpecialPerformanceServiceImpl implements SpecialPerformanceService
                         supplierItemVo.setCurrentPrice("0");
                     }
                     AuctionConfig auctionConfig = auctionConfigDao.findByItemId(supplierItem.getId());
+                    supplierItemVo.setAuctionStartTime(auctionConfig.getStartTime());
                     supplierItemVo.setRealEndTime(auctionConfig.getRealEndTime());
-                    if (now.before(auctionConfig.getStartTime())) {
-                        supplierItemVo.setState(DistributionEnum.AuctionStateEnum.NOT_START.getCode());
-                        supplierItemVo.setStateName(DistributionEnum.AuctionStateEnum.NOT_START.getDes());
+                    supplierItemVo.setState(auctionConfig.getState());
+                    supplierItemVo.setStateName(AuctionEnum.StateEnum.getNameByCode(auctionConfig.getState()));
+
+                    if (previewStartTime.after(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.getRealEndTime().after(now)) {
+                        supplierItemVo.setState(AuctionEnum.StateEnum.AUCTIONING.getCode());
+                        supplierItemVo.setStateName(AuctionEnum.StateEnum.AUCTIONING.getDes());
                     } else if (now.after(auctionConfig.getRealEndTime())) {
-                        supplierItemVo.setState(DistributionEnum.AuctionStateEnum.END.getCode());
-                        supplierItemVo.setStateName(DistributionEnum.AuctionStateEnum.END.getDes());
+                        supplierItemVo.setState(AuctionEnum.StateEnum.END.getCode());
+                        supplierItemVo.setStateName(AuctionEnum.StateEnum.END.getDes());
                         //如果当前时间已经超过截拍时间，并且竞拍配置还未改成无效，则进行修改
                         if (auctionConfig.getIsValid()) {
                             auctionConfigDao.setEnd(supplierItem.getId());
                         }
-                    } else {
-                        supplierItemVo.setState(DistributionEnum.AuctionStateEnum.IN_AUCTION.getCode());
-                        supplierItemVo.setStateName(DistributionEnum.AuctionStateEnum.IN_AUCTION.getDes());
                     }
                     AuctionRecordRequestDto auctionRecordRequestDto = new AuctionRecordRequestDto();
                     auctionRecordRequestDto.setItemId(supplierItemVo.getItemId());
@@ -228,19 +251,18 @@ public class SpecialPerformanceServiceImpl implements SpecialPerformanceService
             resultMap.put("dataList", PageSearchResult.of(pageInfo, supplierItemVos));
             resultMap.put("endTime", specialPerformance.getEndTime());
             resultMap.put("title", specialPerformance.getTitle());
-            Date now = new Date();
             //当前时间大于专场结束时间则修改专场的状态
             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

@@ -504,6 +504,8 @@ public class SupplierItemServiceImpl implements SupplierItemService {
         try {
             AuctionDetailVo auctionDetailVo = new AuctionDetailVo();
             Date now = new Date();
+            Instant startInstant = now.toInstant().plus(Duration.ofDays(1));
+            Date previewStartTime = Date.from(startInstant);
             Long itemId;
             String shareRecordId = dto.getShareRecordId();
             DistributorShareRecord distributorShareRecord = null;
@@ -542,6 +544,14 @@ public class SupplierItemServiceImpl implements SupplierItemService {
                 //拍卖专场进入详情页，增加围观次数
                 specialPerformanceConfigDao.addViewNum(itemId);
             }
+            //查询商品所属专场id
+            SpecialPerformanceConfigRequestDto specialPerformanceConfigRequestDto = new SpecialPerformanceConfigRequestDto();
+            specialPerformanceConfigRequestDto.setItemId(itemId);
+            List<SpecialPerformanceConfig> specialPerformanceConfigList = specialPerformanceConfigDao.findList(specialPerformanceConfigRequestDto);
+            if (!CollectionUtils.isEmpty(specialPerformanceConfigList)) {
+                SpecialPerformanceConfig specialPerformanceConfig = specialPerformanceConfigList.get(0);
+                auctionDetailVo.setSpecialPerformanceId(specialPerformanceConfig.getSpecialPerformanceId());
+            }
 
             //查询商品竞拍信息
             AuctionConfig auctionConfig = auctionConfigDao.findByItemId(itemId);
@@ -599,14 +609,20 @@ public class SupplierItemServiceImpl implements SupplierItemService {
             auctionDetailVo.setStartTime(startTime);
             auctionDetailVo.setEndTime(auctionConfig.getEndTime());
             auctionDetailVo.setRealEndTime(realEndTime);
+            auctionDetailVo.setState(auctionConfig.getState());
+            auctionDetailVo.setStateName(AuctionEnum.StateEnum.getNameByCode(auctionConfig.getState()));
 
             DistributionOrder distributionOrder = distributionOrderDao.findByItemId(itemId);
-            if (now.before(startTime)) {
-                auctionDetailVo.setState(DistributionEnum.AuctionStateEnum.NOT_START.getCode());
-                auctionDetailVo.setStateName(DistributionEnum.AuctionStateEnum.NOT_START.getDes());
+            //拍品的状态，提前一天为预览中
+            if (previewStartTime.after(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.getRealEndTime().after(now)) {
+                auctionDetailVo.setState(AuctionEnum.StateEnum.AUCTIONING.getCode());
+                auctionDetailVo.setStateName(AuctionEnum.StateEnum.AUCTIONING.getDes());
             } else if (now.after(realEndTime)) {
-                auctionDetailVo.setState(DistributionEnum.AuctionStateEnum.END.getCode());
-                auctionDetailVo.setStateName(DistributionEnum.AuctionStateEnum.END.getDes());
+                auctionDetailVo.setState(AuctionEnum.StateEnum.END.getCode());
+                auctionDetailVo.setStateName(AuctionEnum.StateEnum.END.getDes());
                 auctionDetailVo.setUserState(DistributionEnum.AuctionUserStateEnum.END.getCode());
                 auctionDetailVo.setUserStateName(DistributionEnum.AuctionUserStateEnum.END.getDes());
                 //如果当前时间已经超过截拍时间，并且竞拍配置还未改成无效，则进行修改
@@ -644,8 +660,6 @@ public class SupplierItemServiceImpl implements SupplierItemService {
                         auctionDetailVo.setUserStateName(DistributionEnum.AuctionUserStateEnum.LEAD.getDes());
                     }
                 }
-                auctionDetailVo.setState(DistributionEnum.AuctionStateEnum.IN_AUCTION.getCode());
-                auctionDetailVo.setStateName(DistributionEnum.AuctionStateEnum.IN_AUCTION.getDes());
             }
             auctionDetailVo.setRule("中拍买家对应的分销商可获得最终成拍价的3%的金额作为佣金奖励，" +
                     "其余参与分销的分销商平分最终成拍价的3%的金额。若多个分销商分销给同一个买家，" +

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

@@ -78,6 +78,9 @@ public class SpecialPerformanceNoticeJob {
     @Autowired
     UserDao userDao;
 
+    @Value("${spring.profiles.active}")
+    private String env;
+
     private final static String SPECIAL_PERFORMANCE_URL = "/pages/saleSpecialList/index";
 
     /**
@@ -85,6 +88,7 @@ public class SpecialPerformanceNoticeJob {
      */
     @Scheduled(fixedDelay = 1000 * 60 * 10)
     public void execute() {
+
         RLock lock = redissonClient.getLock(SPECIAL_PERFORMANCE_SEND_MSG_KEY);
         if (!lock.tryLock()) {
             logger.warn("专场即将开始通知任务,当前服务实例获取锁成功: {} 获取锁失败，锁被占用不执行",  Thread.currentThread().getId());
@@ -109,6 +113,10 @@ public class SpecialPerformanceNoticeJob {
             SpecialPerformance specialPerformance = specialPerformanceList.get(0);
             String abortStartKey = SPECIAL_PERFORMANCE_START_NOTICE_KEY + specialPerformance.getId();
             if (!redisUtils.hasKey(abortStartKey)) {
+                if ("dev".equals(env)) {
+                    logger.info(">>>>>>>>>>>>>>>>>>>>>>> dev环境, 不执行专场即将开始通知任务<<<<<<<<<<<<<<<<<<<<<");
+                    return;
+                }
                 logger.info("当前即将开始的专场id:{}, 名称为 {} ", specialPerformance.getId(), specialPerformance.getTitle());
                 //发送短信通知
                 String url = wxAppletApi.getUrlLink(SPECIAL_PERFORMANCE_URL,"specialId=" + specialPerformance.getId());
@@ -172,7 +180,7 @@ public class SpecialPerformanceNoticeJob {
                 } else if (specialPerformance.getState().intValue() == SpecialPerformanceEnum.StateEnum.NOT_START.getCode()) {
                     //未开始的专场判断是否需要改为预展中，开始时间提前一天预展
                     //设置为预展中
-                    if (startTime.before(specialPerformance.getStartTime()) && specialPerformance.getStartTime().after(now)) {
+                    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());
                         }
@@ -205,18 +213,18 @@ public class SpecialPerformanceNoticeJob {
                     AuctionConfig auctionConfig = auctionConfigDao.findByItemId(itemId);
                     if (auctionConfig.getState().intValue() == AuctionEnum.StateEnum.WAIT_ON_SALE.getCode()) {
                         //待上架的拍品判断是否需要改为预展中，开始时间提前一天预展
-                        if (startTime.before(auctionConfig.getStartTime()) && auctionConfig.getStartTime().after(now)) {
+                        if (startTime.after(auctionConfig.getStartTime()) && auctionConfig.getStartTime().after(now)) {
                             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());