寄售单详情返回是否有报价字段，列表新增运单号筛选条件

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

@@ -29,6 +29,11 @@ public class ConsignSaleDetailVo implements Entity {
      */
     private CoinVo itemVo;
 
+    /**
+     * 是否有报价
+     */
+    private Boolean isHasPrice;
+
     /**
      * 寄售单信息
      */

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

@@ -183,6 +183,24 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
 
             //查询寄售单信息
             List<ConsignSaleRecord> consignSaleRecords = consignSaleRecordDao.find(dto.getSaleId());
+
+            //判断是否已经有了报价
+            if (consignSale.getSystemState() == ConsignSaleEnum.SaleForSysStateEnum.WAIT_IMG_VALUATE.getCode()) {
+                long count = consignSaleRecords.stream().filter(consignSaleRecord -> consignSaleRecord.getType() == ConsignSaleEnum.OperateTypeEnum.VALUATE.getCode()).count();
+                if (count == 0) {
+                    consignSaleDetailVo.setIsHasPrice(false);
+                } else {
+                    consignSaleDetailVo.setIsHasPrice(true);
+                }
+            } else if (consignSale.getSystemState() == ConsignSaleEnum.SaleForSysStateEnum.IDENTIFY.getCode()) {
+                long count = consignSaleRecords.stream().filter(consignSaleRecord -> consignSaleRecord.getType() == ConsignSaleEnum.OperateTypeEnum.IDENTIFY.getCode()).count();
+                if (count == 0) {
+                    consignSaleDetailVo.setIsHasPrice(false);
+                } else {
+                    consignSaleDetailVo.setIsHasPrice(true);
+                }
+            }
+
             List<ConsignSaleRecordVo> consignSaleRecordVoList = new ArrayList<>();
             consignSaleRecords.forEach(consignSaleRecord -> {
                 ConsignSaleRecordVo consignSaleRecordVo = new ConsignSaleRecordVo();
@@ -352,7 +370,6 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
             consignSale.setSettleAmount(settleAmount);
             consignSaleDao.update(consignSale);
 
-
             //卖出后商品下架
             itemDao.updateOnSale(itemId, ItemStateEnum.SALED.getCode());
             //插入操作记录,货品售出待结款

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

@@ -57,6 +57,7 @@ public class ConsignSaleDaoImpl implements ConsignSaleDao {
         ConsignSaleExample example = new ConsignSaleExample();
         ConsignSaleExample.Criteria criteria = example.createCriteria();
         JdbcHelper.ifPresent(dto.getSaleId(), criteria::andSaleIdEqualTo);
+        JdbcHelper.ifPresent(dto.getWaybill(), criteria::andWaybillEqualTo);
         JdbcHelper.ifPresent(dto.getItemId(), criteria::andItemIdEqualTo);
         JdbcHelper.ifPresent(dto.getItemIds(), criteria::andItemIdIn);
         JdbcHelper.ifPresent(dto.getUserId(), criteria::andUserIdEqualTo);