后台寄售单列表展示

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

@@ -9,6 +9,7 @@ import com.wwdz.ch.admin.service.ItemService;
 import com.wwdz.ch.core.api.OfficialAccountApi;
 import com.wwdz.ch.core.consts.ConsignSaleEnum;
 import com.wwdz.ch.core.consts.ItemStateEnum;
+import com.wwdz.ch.core.consts.LogisticsEnum;
 import com.wwdz.ch.core.entity.ConsignSaleSubscribeMsg;
 import com.wwdz.ch.core.entity.ConsignSaleVo;
 import com.wwdz.ch.core.type.PageSearchResult;
@@ -38,6 +39,8 @@ import org.springframework.util.ObjectUtils;
 
 import java.lang.System;
 import java.math.BigDecimal;
+import java.time.Duration;
+import java.time.Instant;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -96,13 +99,39 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
                     String[] image = item.getImages().split(";");
                     consignSaleVo.setItemImg(image[0]);
                 }
+                //查询寄售单节点
+                String saleId = dto.getSaleId();
+                List<ConsignSaleRecord> consignSaleRecordList = consignSaleRecordDao.find(saleId);
+                //报价待用户确认，需要返回倒计时
+                List<ConsignSaleRecord> waitConfirmRecords = new ArrayList<>();
+                //判断是否已经有了报价
+                if (consignSale.getSystemState() == ConsignSaleEnum.SaleForSysStateEnum.WAIT_IMG_VALUATE.getCode()) {
+                    waitConfirmRecords = consignSaleRecordList.stream().filter(consignSaleRecord -> consignSaleRecord.getType() == ConsignSaleEnum.OperateTypeEnum.VALUATE.getCode()).collect(Collectors.toList());
+                } else if (consignSale.getSystemState() == ConsignSaleEnum.SaleForSysStateEnum.IDENTIFY.getCode()) {
+                    waitConfirmRecords = consignSaleRecordList.stream().filter(consignSaleRecord -> consignSaleRecord.getType() == ConsignSaleEnum.OperateTypeEnum.IDENTIFY.getCode()).collect(Collectors.toList());
+                }
+                if (CollectionUtils.isEmpty(waitConfirmRecords)) {
+                    consignSaleVo.setIsHasPrice(false);
+                } else {
+                    //有了报价，需要返回倒计时
+                    consignSaleVo.setIsHasPrice(true);
+                    Date date = waitConfirmRecords.get(0).getCreateTime();
+                    Instant instant = date.toInstant().plus(Duration.ofHours(24));
+                    Date time = Date.from(instant);
+                    consignSaleVo.setCountdownTime(time);
+                }
 
                 consignSaleVo.setSaleId(consignSale.getSaleId());
                 consignSaleVo.setHomePageImage(MediaUtil.getHomePageImage(item.getImages(), item.getVideos()));
                 consignSaleVo.setItemName(item.getName());
+                consignSaleVo.setCustomState(consignSale.getCustomState());
+                consignSaleVo.setCustomStateName(ConsignSaleEnum.SaleForUserStateEnum.getNameByCode(consignSale.getCustomState()));
                 consignSaleVo.setSystemState(consignSale.getSystemState());
                 consignSaleVo.setSystemStateName(ConsignSaleEnum.SaleForSysStateEnum.getNameByCode(consignSale.getSystemState()));
                 consignSaleVo.setSaleTime(consignSale.getSaleTime());
+                consignSaleVo.setLogisticsCode(consignSale.getLogisticsCode());
+                consignSaleVo.setLogisticsName(LogisticsEnum.getNameByCode(consignSale.getLogisticsCode()));
+                consignSaleVo.setWaybill(consignSale.getWaybill());
                 if (consignSale.getSystemState().intValue() == ConsignSaleEnum.SaleForSysStateEnum.CANCEL.getCode()) {
                     List<ConsignSaleRecord> consignSaleRecords = consignSaleRecordDao.find(consignSale.getSaleId());
                     List<Integer> operateType = consignSaleRecords.stream().map(ConsignSaleRecord::getType).collect(Collectors.toList());
@@ -114,7 +143,6 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
                         ConsignSaleRecord consignSaleRecord = consignSaleRecords.stream().filter(s->s.getType().intValue() == ConsignSaleEnum.OperateTypeEnum.SYS_CANCEL.getCode()).collect(Collectors.toList()).get(0);
                         consignSaleVo.setRemark(consignSaleRecord.getRemark().startsWith("理由:")?consignSaleRecord.getRemark().split(":")[1]:consignSaleRecord.getRemark());
                     }
-
                 }
                 consignSaleVoList.add(consignSaleVo);
             });

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

@@ -101,4 +101,30 @@ public class ConsignSaleVo implements Entity {
      * 原因
      */
     private String remark;
+
+    /**
+     * 物流公司
+     */
+    private String logisticsCode;
+
+    /**
+     * 物流公司名称
+     */
+    private String logisticsName;
+
+    /**
+     * 快递单号
+     */
+    private String waybill;
+
+    /**
+     * 倒计时时间
+     */
+    private Date countdownTime;
+
+    /**
+     * 是否有估价
+     */
+    private Boolean isHasPrice;
+
 }