编辑商品3

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

@@ -192,6 +192,11 @@ public class SysSupplierItemServiceImpl implements SysSupplierItemService {
                 auctionConfig.setRealEndTime(DateUtils.parseString(dto.getAuctionEndTime()));
                 auctionConfig.setStartPrice(PriceUtil.convertPriceFromStr(dto.getStartPrice()));
                 auctionConfig.setAddExtent(PriceUtil.convertPriceFromStr(dto.getAddExtent()));
+                //修改的截拍时间在当前时间之后，则重新上架，设置拍卖信息为有效
+                if (DateUtils.parseString(dto.getAuctionEndTime()).after(new Date())) {
+                    auctionConfig.setIsValid(true);
+                    auctionConfig.setIsDeal(false);
+                }
                 auctionConfigDao.update(auctionConfig);
             }
             return Result.success();

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

@@ -154,5 +154,10 @@ public class SupplierItemVo implements Entity {
      */
     private Boolean editAble;
 
+    /**
+     * 针对竞拍品
+     * 最新价格
+     */
+    private String currentPrice;
 
 }

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

@@ -37,4 +37,6 @@ public interface SupplierItemDao {
      * @return
      */
     int updateStock(long itemId, int stock);
+
+
 }

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

@@ -87,6 +87,18 @@ public class SupplierItemServiceImpl implements SupplierItemService {
                 supplierItemVo.setSupplyPrice(PriceUtil.convertPriceFenToYuan(supplierItem.getSupplyPrice()));
                 supplierItemVo.setDistributionPrice(PriceUtil.convertPriceFenToYuan(supplierItem.getDistributionPrice()));
                 supplierItemVo.setHomePageImage(MediaUtil.getHomePageImage(supplierItem.getImages(), supplierItem.getVideos()));
+                //竞拍商品需要展示当前价
+                if (supplierItem.getType() == DistributionEnum.DistributionTypeEnum.AUCTION.getCode()) {
+                    AuctionRecord auctionRecord = auctionRecordDao.findLastedRecord(supplierItem.getId());
+                    if (auctionRecord != null && auctionRecord.getPrice() != null) {
+                        supplierItemVo.setCurrentPrice(PriceUtil.convertPriceFenToYuan(auctionRecord.getPrice()));
+                    } else {
+                        //查询商品起拍价
+                        AuctionConfig auctionConfig = auctionConfigDao.findByItemId(supplierItem.getId());
+                        supplierItemVo.setCurrentPrice(PriceUtil.convertPriceFenToYuan(auctionConfig.getStartPrice()));
+                    }
+                }
+
                 supplierItemVos.add(supplierItemVo);
             });
             return Result.success(PageSearchResult.of(pageInfo, supplierItemVos));
@@ -264,6 +276,17 @@ public class SupplierItemServiceImpl implements SupplierItemService {
                 supplierItemVo.setSalePrice(PriceUtil.convertPriceFenToYuan(map.get(supplierItem.getId()).getPrice()));
                 supplierItemVo.setHomePageImage(MediaUtil.getHomePageImage(supplierItem.getImages(), supplierItem.getVideos()));
                 supplierItemVo.setShareId(map.get(supplierItem.getId()).getShareId());
+                //竞拍商品需要展示当前价
+                if (supplierItem.getType() == DistributionEnum.DistributionTypeEnum.AUCTION.getCode()) {
+                    AuctionRecord auctionRecord = auctionRecordDao.findLastedRecord(supplierItem.getId());
+                    if (auctionRecord != null && auctionRecord.getPrice() != null) {
+                        supplierItemVo.setCurrentPrice(PriceUtil.convertPriceFenToYuan(auctionRecord.getPrice()));
+                    } else {
+                        //查询商品起拍价
+                        AuctionConfig auctionConfig = auctionConfigDao.findByItemId(supplierItem.getId());
+                        supplierItemVo.setCurrentPrice(PriceUtil.convertPriceFenToYuan(auctionConfig.getStartPrice()));
+                    }
+                }
                 supplierItemVos.add(supplierItemVo);
             });
             return Result.success(PageSearchResult.of(pageInfo, supplierItemVos));
@@ -397,8 +420,8 @@ public class SupplierItemServiceImpl implements SupplierItemService {
             }
             auctionDetailVo.setRule("中拍买家对应的分销商可获得最终成拍价的3%的金额作为佣金奖励，" +
                     "其余参与分销的分销商平分最终成拍价的3%的金额。若多个分销商分销给同一个买家，" +
-                    "奖励则归属于第一个分享给买家的分销商。" +
-                    "（举例：某拍品最终成拍价是1000元，有4个分销商参与分销，则中拍买家的分销商分得30元佣金，其余3个分销商没人分得10元佣金）");
+                    "奖励则归属于第一个分享给买家的分销商。（举例：某拍品最终成拍价是1000元，" +
+                    "有4个分销商参与分销，则中拍买家的分销商分得30元佣金，其余3个分销商每人分得10元佣金）");
             auctionDetailVo.setDescription(supplierItem.getDescription());
             //是否延迟截拍的标识
             if (!auctionConfig.getEndTime().equals(auctionConfig.getRealEndTime())) {

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

 package com.wwdz.ch.wx.job;
 
-import com.github.pagehelper.PageInfo;
 import com.wwdz.ch.core.type.Result;
-import com.wwdz.ch.db.dao.ItemDao;
-import com.wwdz.ch.db.dao.SynDataRecordDao;
 import com.wwdz.ch.db.dao.distribution.AuctionConfigDao;
 import com.wwdz.ch.db.dao.distribution.AuctionRecordDao;
 import com.wwdz.ch.db.dao.distribution.DistributionOrderDao;
-import com.wwdz.ch.db.domain.Item;
-import com.wwdz.ch.db.domain.SynDataRecord;
+import com.wwdz.ch.db.dao.distribution.SupplierItemDao;
 import com.wwdz.ch.db.domain.distribution.AuctionConfig;
 import com.wwdz.ch.db.domain.distribution.AuctionRecord;
 import com.wwdz.ch.db.domain.distribution.DistributionOrder;
-import com.wwdz.ch.db.dto.request.CoinRequestDto;
+import com.wwdz.ch.db.domain.distribution.SupplierItem;
 import com.wwdz.ch.db.dto.request.distribution.DistributionOrderRequestDto;
-import com.wwdz.ch.db.es.ItemEsDao;
 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;
@@ -25,12 +19,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
-
-import java.util.Date;
 import java.util.List;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.stream.IntStream;
+
 
 /**
  * 拍卖结束自动创建订单
@@ -57,6 +47,9 @@ public class AutoCreateAuctionOrderJob {
     @Autowired
     AuctionRecordDao auctionRecordDao;
 
+    @Autowired
+    SupplierItemDao supplierItemDao;
+
     /**
      * 隔2分钟运行一次
      */
@@ -72,9 +65,13 @@ public class AutoCreateAuctionOrderJob {
             //查询过期未截拍的商品记录
             List<AuctionConfig> timeOutNotValidList = auctionConfigDao.findTimeOutNotValidList();
             timeOutNotValidList.forEach(auctionConfig -> {
-                //修改为已截拍
+                //修改为已截拍,并在商品表中把该商品改为下架
                 auctionConfigDao.setEnd(auctionConfig.getItemId());
-                logger.info("============== 拍卖 商品id:{}， 超过截拍时间，系统自动修改为截拍状态 ==============", auctionConfig.getItemId());
+                SupplierItem supplierItem = new SupplierItem();
+                supplierItem.setId(auctionConfig.getItemId());
+                supplierItem.setIsOnSale(false);
+                supplierItemDao.update(supplierItem);
+                logger.info("============== 拍卖 商品id:{}， 超过截拍时间，系统自动修改为截拍状态,商品下架 ==============", auctionConfig.getItemId());
             });
 
             //查询一小时内拍卖截拍的商品