库存列表添加早鸟优惠数量

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/admin/voyagestock/vo/VoyageStockBaseVO.java

@@ -74,4 +74,7 @@ public class VoyageStockBaseVO {
     private Long routeId;
 
     private Integer direction;
+
+    @Schema(description = "营销政策库存", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    private BigDecimal policyNum;
 }

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/service/voyagestock/VoyageStockServiceImpl.java

@@ -2,6 +2,7 @@ package com.yc.ship.module.product.service.voyagestock;
 
 import com.yc.ship.framework.common.util.collection.CollectionUtils;
 import com.yc.ship.framework.common.util.collection.MapUtils;
+import com.yc.ship.module.product.dal.mysql.voyagestockdistribute.VoyageStockDistributeNewMapper;
 import com.yc.ship.module.resource.api.ship.ShipApi;
 import com.yc.ship.module.resource.api.ship.dto.ShipRespDTO;
 import org.springframework.stereotype.Service;
@@ -17,6 +18,7 @@ import com.yc.ship.framework.common.util.object.BeanUtils;
 
 import com.yc.ship.module.product.dal.mysql.voyagestock.VoyageStockMapper;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -37,6 +39,9 @@ public class VoyageStockServiceImpl implements VoyageStockService {
     @Resource
     private ShipApi shipApi;
 
+    @Resource
+    private VoyageStockDistributeNewMapper voyageStockDistributeNewMapper;
+
 
     @Transactional(rollbackFor = Exception.class)
     @Override
@@ -79,7 +84,14 @@ public class VoyageStockServiceImpl implements VoyageStockService {
         List<Long> shipIds = CollectionUtils.convertList(list, VoyageStockRespVO::getShipId);
         Map<Long, ShipRespDTO> shipMap = shipApi.queryShip(shipIds);
         list.stream().forEach(item -> {
+            // 根据航次查询是否有营销政策（暂时包含当天）
+            BigDecimal policyNum = voyageStockDistributeNewMapper.selectIsPolicy(item.getVoyageId());
             MapUtils.findAndThen(shipMap, item.getShipId(), ship -> item.setShipName(ship.getName()));
+            if(policyNum!= null){
+                item.setPolicyNum(policyNum);
+            }else {
+                item.setPolicyNum(BigDecimal.ZERO);
+            }
         });
         return page;
     }