发消息2

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

@@ -32,6 +32,14 @@ public interface AuctionConfigDao {
     AuctionConfig findByItemId(long itemId);
 
 
+    /**
+     * 查询截拍时间超过指定时间的拍卖配置
+     * @param
+     * @return
+     */
+    List<AuctionConfig> findList(Date startTime, Date endTime);
+
+
     /**
      * 查询截拍未处理的商品记录
      * @param

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

@@ -44,6 +44,16 @@ public class AuctionConfigDaoImpl implements AuctionConfigDao {
         return auctionConfigMapper.selectOneByExample(example);
     }
 
+    @Override
+    public List<AuctionConfig> findList(Date startTime, Date endTime) {
+        AuctionConfigExample example = new AuctionConfigExample();
+        AuctionConfigExample.Criteria criteria = example.createCriteria();
+        criteria.andRealEndTimeGreaterThanOrEqualTo(startTime);
+        criteria.andRealEndTimeLessThanOrEqualTo(endTime);
+        criteria.andIsValidEqualTo(false);
+        return auctionConfigMapper.selectByExample(example);
+    }
+
     @Override
     public int updateRealEndTime(long itemId, Date realEndTime) {
         AuctionConfigExample example = new AuctionConfigExample();
@@ -87,12 +97,7 @@ public class AuctionConfigDaoImpl implements AuctionConfigDao {
         AuctionConfig auctionConfig = new AuctionConfig();
         auctionConfig.setUpdateTime(new Date());
         auctionConfig.setIsValid(false);
-        auctionConfigMapper.updateByExampleSelective(auctionConfig, example);
-        SupplierItem supplierItem = new SupplierItem();
-        supplierItem.setId(itemId);
-        supplierItem.setIsOnSale(false);
-        supplierItemDao.update(supplierItem);
-        return 1;
+        return auctionConfigMapper.updateByExampleSelective(auctionConfig, example);
     }
 
     @Override

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

@@ -294,7 +294,7 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
                 auctionConfigDao.setDeal(dto.getItemId());
                 //发送中拍信息给用户
                 String userOpenId = sendMsgService.getOpenIdByUserId(auctionRecord.getUserId());
-                Instant instant = now.toInstant().plus(Duration.ofHours(24));
+                Instant instant = auctionConfig.getRealEndTime().toInstant().plus(Duration.ofHours(24));
                 Date payEndTime = Date.from(instant);
                 if (com.xxdxxs.utils.StringUtils.hasLength(userOpenId)) {
                     AuctionOfferNoticeMsg auctionOfferNoticeMsg = new AuctionOfferNoticeMsg();

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

@@ -11,6 +11,7 @@ import com.wwdz.ch.db.domain.distribution.DistributionOrder;
 import com.wwdz.ch.db.domain.distribution.SupplierItem;
 import com.wwdz.ch.db.dto.request.distribution.DistributionOrderRequestDto;
 import com.wwdz.ch.wx.service.distribution.DistributionOrderService;
+import com.xxdxxs.utils.DateUtils;
 import com.xxdxxs.utils.StringUtils;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
@@ -19,6 +20,11 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
+
+import java.time.Duration;
+import java.time.Instant;
+import java.util.Date;
 import java.util.List;
 
 
@@ -67,10 +73,7 @@ public class AutoCreateAuctionOrderJob {
             timeOutNotValidList.forEach(auctionConfig -> {
                 //修改为已截拍,并在商品表中把该商品改为下架
                 auctionConfigDao.setEnd(auctionConfig.getItemId());
-               /* SupplierItem supplierItem = new SupplierItem();
-                supplierItem.setId(auctionConfig.getItemId());
-                supplierItem.setIsOnSale(false);
-                supplierItemDao.update(supplierItem);*/
+
                 logger.info("============== 拍卖 商品id:{}， 超过截拍时间，系统自动修改为截拍状态,商品下架 ==============", auctionConfig.getItemId());
             });
 
@@ -100,6 +103,28 @@ public class AutoCreateAuctionOrderJob {
                     auctionConfigDao.setDeal(itemId);
                 }
             });
+            //把截拍超过24小时的商品设置为下架
+            Date now = new Date();
+            Instant instant =  now.toInstant().minus(Duration.ofHours(25));
+            Date startTime = Date.from(instant);
+            //把截拍超过24小时的商品设置为下架
+            Instant endInstant =  now.toInstant().minus(Duration.ofHours(24));
+            Date endTime = Date.from(endInstant);
+            List<AuctionConfig> auctionConfigs = auctionConfigDao.findList(startTime, endTime);
+            logger.info(">>>>>>>>>> 截拍商品自动下架查询范围:{} 至 {} <<<<<<<<<<<", DateUtils.toString(startTime), DateUtils.toString(endTime));
+            if (!CollectionUtils.isEmpty(auctionConfigs)) {
+                for (AuctionConfig auctionConfig : auctionConfigs) {
+                    long itemId = auctionConfig.getItemId();
+                    SupplierItem supplierItem = supplierItemDao.findById(itemId);
+                    if (supplierItem.getIsOnSale()) {
+                        SupplierItem updateItem = new SupplierItem();
+                        updateItem.setId(itemId);
+                        updateItem.setIsOnSale(false);
+                        supplierItemDao.update(updateItem);
+                        logger.info(">>>>>>>>>> 定时作业检测商品id:{}, 已经截拍大于24小时，自动下架 <<<<<<<<<<<", itemId);
+                    }
+                }
+            }
         } catch (Exception e) {
             logger.error("同步item增量数据到ES error {}", e);
         } finally {