用户更新藏品，预估价设置null2

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

@@ -1296,7 +1296,7 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
 
     public void checkPrePayTimeOut(String distributionOrderId, int type){
         DistributionOrder distributionOrder = distributionOrderDao.findById(distributionOrderId);
-        if (distributionOrder.getState() == DistributionEnum.DistributionOrderStateEnum.PRE_PAY.getCode()) {
+        if (distributionOrder.getState() == DistributionEnum.DistributionOrderStateEnum.PRE_PAY.getCode() || distributionOrder.getState() == DistributionEnum.DistributionOrderStateEnum.PRE_EXCHANGE.getCode()) {
             long diffInMillies = Math.abs(new Date().getTime() -  distributionOrder.getCreateTime().getTime());
             if (type == DistributionEnum.DistributionTypeEnum.FIXED_PRICE.getCode()) {
                 long diffInMinutes = diffInMillies / (60 * 1000);

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

 package com.wwdz.ch.wx.impl.distribution;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.dubbo.config.annotation.Reference;
 import com.github.pagehelper.PageInfo;
@@ -809,11 +810,15 @@ public class SupplierItemServiceImpl implements SupplierItemService {
         try {
             SupplierItem oldItem = supplierItemDao.findById(dto.getId());
             SupplierItem supplierItem = new SupplierItem();
-            EntityMapper.copyAttribute(oldItem, supplierItem);
-            EntityMapper.copyAttribute(dto, supplierItem);
+            BeanUtil.copyProperties(oldItem, supplierItem);
+            BeanUtil.copyProperties(dto, supplierItem);
             supplierItem.setDistributionPrice(PriceUtil.convertPriceFromStr(StringUtils.isEmpty(dto.getDistributionPrice())?"0":dto.getDistributionPrice()));
             supplierItem.setImages(dto.getImages());
             supplierItem.setOfficialEstimatedPrice(null);
+          /*  supplierItem.setType(oldItem.getType());
+            supplierItem.setCreatorId(oldItem.getCreatorId());
+            supplierItem.setRebate(oldItem.getRebate());
+            supplierItem.setSupplierId(oldItem.getSupplierId());*/
             if (StringUtils.hasLength(dto.getVideos())) {
                 supplierItem.setVideos(getVideosImage(dto.getVideos()));
             }