换藏订单列表2

ch-admin-api/src/main/java/com/wwdz/ch/admin/entity/vo/SysDistributionOrderVo.java

@@ -60,10 +60,15 @@ public class SysDistributionOrderVo implements Entity {
     private String userExchangeItemId;
 
     /**
-     * 用户用于交换的商品官方估计
+     * 用户用于交换的商品官方估价
      */
     private String userExchangeItemOfficalPrice;
 
+    /**
+     * 用户用于交换的商品图片
+     */
+    private Map<String, Object> userExchangeItemImage;
+
     /**
      * 买方id
      */

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

@@ -24,6 +24,7 @@ import com.wwdz.ch.db.domain.distribution.*;
 import com.wwdz.ch.db.dto.request.distribution.DistributionOrderRequestDto;
 import com.wwdz.ch.db.dto.request.distribution.SupplierItemRequestDto;
 import com.xxdxxs.utils.EntityMapper;
+import jdk.internal.org.objectweb.asm.Handle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,10 +34,7 @@ import org.springframework.util.StringUtils;
 
 import java.time.Duration;
 import java.time.Instant;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 
@@ -142,6 +140,7 @@ public class SysDistributionOrderServiceImpl implements SysDistributionOrderServ
                     String userItemId = "";
                     String userItemName = "";
                     String price = "";
+                    Map<String, Object> map = new HashMap<>();
                     for (ExchangeOrderSnapshot exchangeOrderSnapshot : exchangeOrderSnapshotList) {
                         if (StringUtils.hasLength(userItemId)) {
                             userItemId = userItemId + ",";
@@ -151,10 +150,12 @@ public class SysDistributionOrderServiceImpl implements SysDistributionOrderServ
                         userItemId = userItemId + exchangeOrderSnapshot.getItemId();
                         userItemName = userItemName + exchangeOrderSnapshot.getItemName();
                         price = price + PriceUtil.convertPriceFenToYuan(exchangeOrderSnapshot.getOfficialEstimatedPrice());
+                        map.put(userItemId, MediaUtil.getHomePageImage(exchangeOrderSnapshot.getImages(), exchangeOrderSnapshot.getVideos()));
                     }
                     distributionOrderVo.setUserExchangeItemId(userItemId);
                     distributionOrderVo.setUserExchangeItemName(userItemName);
                     distributionOrderVo.setUserExchangeItemOfficalPrice(price);
+                    distributionOrderVo.setUserExchangeItemImage(map);
                 }
                 distributionOrderVoList.add(distributionOrderVo);
             });

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

@@ -34,7 +34,6 @@ public class ExchangeOrderSnapshotDaoImpl implements ExchangeOrderSnapshotDao {
         ExchangeOrderSnapshotExample example = new ExchangeOrderSnapshotExample();
         ExchangeOrderSnapshotExample.Criteria criteria = example.createCriteria();
         criteria.andDistributionOrderIdEqualTo(orderId);
-        criteria.andIsValidEqualTo(true);
         return exchangeOrderSnapshotMapper.selectByExampleWithBLOBs(example);
     }