后台交换单列表

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

+package com.wwdz.ch.admin.entity.vo;
+
+import com.wwdz.ch.core.entity.SupplierItemVo;
+import com.xxdxxs.entity.Entity;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class SysExchangeApplyOrderDetailVo implements Entity {
+
+    /**
+     * 申请交换单
+     */
+    private String exchangeApplyOrderId;
+
+    /**
+     * 申请单创建时间
+     */
+    private Date createTime;
+
+
+    /**
+     * 用于交换的用户商品信息
+     */
+    private SysDistributionOrderVo userItemList;
+
+    /**
+     * 想要换的目标商品id
+     */
+    private List<SupplierItemVo> targetItemList;
+}

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

+package com.wwdz.ch.admin.entity.vo;
+
+import com.xxdxxs.entity.Entity;
+import lombok.Data;
+
+@Data
+public class SysExchangeOrderVo implements Entity {
+}

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

@@ -28,6 +28,7 @@ import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -135,7 +136,7 @@ public class SysExchangeApplyOrderServiceImpl implements SysExchangeApplyOrderSe
                 targetItemVo.setDistributionPrice(PriceUtil.convertPriceFenToYuan(targetItem.getDistributionPrice()));
                 targetItemVo.setOfficialEstimatedPrice(PriceUtil.convertPriceFenToYuan(targetItem.getOfficialEstimatedPrice()));
                 targetItemVo.setHomePageImage(MediaUtil.getHomePageImage(targetItem.getImages(), targetItem.getVideos()));
-                exchangeApplyOrderVo.setTargetItemInfo(targetItemVo);
+                exchangeApplyOrderVo.setTargetItemList(Arrays.asList(targetItemVo));
 
                 List<ExchangeApplyOrderDetail> detailList = exchangeApplyOrderDetailDao.findByOrderId(exchangeApplyOrder.getExchangeApplyOrderId());
                 List<SupplierItemVo> userItemList = new ArrayList<>();
@@ -152,6 +153,7 @@ public class SysExchangeApplyOrderServiceImpl implements SysExchangeApplyOrderSe
                     userItemList.add(supplierItemVo);
                 }
                 exchangeApplyOrderVo.setUserItemList(userItemList);
+                exchangeApplyOrderVoList.add(exchangeApplyOrderVo);
             }
             return Result.success(PageSearchResult.of(pageInfo, exchangeApplyOrderVoList));
         } catch (Exception e) {
@@ -179,7 +181,7 @@ public class SysExchangeApplyOrderServiceImpl implements SysExchangeApplyOrderSe
             targetItemVo.setOfficialEstimatedPrice(PriceUtil.convertPriceFenToYuan(targetItem.getOfficialEstimatedPrice()));
             targetItemVo.setHomePageImage(MediaUtil.getHomePageImage(targetItem.getImages(), targetItem.getVideos()));
             targetItemVo.setCreatorName(cacheUtil.getAppletUserNameById(targetItem.getCreatorId()));
-            exchangeApplyOrderVo.setTargetItemInfo(targetItemVo);
+            exchangeApplyOrderVo.setTargetItemList(Arrays.asList(targetItemVo));
 
             List<ExchangeApplyOrderDetail> detailList = exchangeApplyOrderDetailDao.findByOrderId(exchangeApplyOrder.getExchangeApplyOrderId());
             List<SupplierItemVo> userItemList = new ArrayList<>();