换藏订单列表

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

@@ -49,6 +49,16 @@ public class SysDistributionOrderVo implements Entity {
      */
     private Integer itemNum;
 
+    /**
+     * 用户用于交换的商品
+     */
+    private String userExchangeItemName;
+
+    /**
+     * 用户用于交换的商品id
+     */
+    private String userExchangeItemId;
+
     /**
      * 买方id
      */

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

@@ -16,12 +16,11 @@ import com.wwdz.ch.core.util.PriceUtil;
 import com.wwdz.ch.core.util.RegexUtil;
 import com.wwdz.ch.db.dao.UserDao;
 import com.wwdz.ch.db.dao.distribution.DistributionOrderDao;
+import com.wwdz.ch.db.dao.distribution.ExchangeOrderSnapshotDao;
 import com.wwdz.ch.db.dao.distribution.IdentifyOrderDao;
 import com.wwdz.ch.db.dao.distribution.SupplierItemDao;
 import com.wwdz.ch.db.domain.User;
-import com.wwdz.ch.db.domain.distribution.DistributionOrder;
-import com.wwdz.ch.db.domain.distribution.IdentifyOrder;
-import com.wwdz.ch.db.domain.distribution.SupplierItem;
+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;
@@ -64,6 +63,9 @@ public class SysDistributionOrderServiceImpl implements SysDistributionOrderServ
     @Autowired
     IdentifyOrderDao identifyOrderDao;
 
+    @Autowired
+    ExchangeOrderSnapshotDao exchangeOrderSnapshotDao;
+
     @Override
     public Result findList(DistributionOrderRequestDto dto) {
         try {
@@ -127,13 +129,29 @@ public class SysDistributionOrderServiceImpl implements SysDistributionOrderServ
                 if (distributionOrder.getType() == DistributionEnum.DistributionTypeEnum.COLLECT.getCode()) {
                     distributionOrderVo.setIntroducerName(distributionOrder.getShareRecordId().equals(CommConsts.DEFAULT_SHARE_ID) ? "系统账号" : cacheUtil.getAppletUserNameById(Long.valueOf(distributionOrder.getShareRecordId())));
                 }
-                distributionOrderVo.setSellerName(distributionOrder.getSellerId() == CommConsts.SYSTEM_ACCOUNT.longValue() ? "系统账号" : cacheUtil.getAppletUserNameById(distributionOrder.getSellerId()));
+                distributionOrderVo.setSellerName(distributionOrder.getSellerId() == CommConsts.SYSTEM_ACCOUNT.longValue() ||
+                        distributionOrder.getSellerId() == CommConsts.SELF_SUPPORT_ACCOUNT.longValue()? "系统账号"
+                        : cacheUtil.getAppletUserNameById(distributionOrder.getSellerId()));
                 //支付截止时间，下单后半小时内
                 Date date = distributionOrder.getCreateTime();
                 Instant instant = date.toInstant().plus(Duration.ofMinutes(30));
                 Date time = Date.from(instant);
                 distributionOrderVo.setPayEndTime(time);
-
+                if (distributionOrder.getType() == DistributionEnum.DistributionTypeEnum.EXCHANGE.getCode()) {
+                    List<ExchangeOrderSnapshot> exchangeOrderSnapshotList = exchangeOrderSnapshotDao.findByOrderId(distributionOrder.getDistributionOrderId());
+                    String userItemId = "";
+                    String userItemName = "";
+                    for (ExchangeOrderSnapshot exchangeOrderSnapshot : exchangeOrderSnapshotList) {
+                        if (StringUtils.hasLength(userItemId)) {
+                            userItemId = userItemId + ",";
+                            userItemName = userItemName + ",";
+                        }
+                        userItemId = userItemId + exchangeOrderSnapshot.getItemId();
+                        userItemName = userItemName + exchangeOrderSnapshot.getItemName();
+                    }
+                    distributionOrderVo.setUserExchangeItemId(userItemId);
+                    distributionOrderVo.setUserExchangeItemName(userItemName);
+                }
                 distributionOrderVoList.add(distributionOrderVo);
             });
             return Result.success(PageSearchResult.of(pageInfo, distributionOrderVoList));