修改早鸟优惠

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/admin/voyagestockdistributeNew/vo/VoyageStockDistributeNewPageRespVO.java

@@ -39,6 +39,9 @@ public class VoyageStockDistributeNewPageRespVO {
     @Schema(description = "是否有营销政策", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     private Integer isPolicy;
 
+    @Schema(description = "营销政策库存", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    private BigDecimal policyNum;
+
     private List<Map<String,Object>> distributeNewRespVOList;
 
 

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/dal/mysql/voyagestockdistribute/VoyageStockDistributeNewMapper.java

@@ -77,7 +77,7 @@ public interface VoyageStockDistributeNewMapper extends BaseMapperX<VoyageStockD
     @TenantIgnore
     List<Map<String, Object>> selectAssignRoomNum(@Param("voyageId")Long voyageId);
 
-    @Select("SELECT count(1) " +
+    @Select("SELECT SUM(mpd.surplus_num) " +
             "FROM marketing_policy mp " +
             "INNER JOIN marketing_policy_detail mpd ON mp.id = mpd.policy_id " +
             "    AND mpd.deleted = 0 " +
@@ -85,8 +85,7 @@ public interface VoyageStockDistributeNewMapper extends BaseMapperX<VoyageStockD
             "WHERE mp.deleted = 0 " +
             "  AND mp.effective_time >= NOW() " +
             "  AND DATE_SUB(DATE(pv.boarding_time), INTERVAL mp.early_days DAY) >= CURDATE() " +
-            "  AND mpd.surplus_num>0 " +
             "  AND mpd.voyage_id = #{voyageId}")
     @TenantIgnore
-    Long selectIsPolicy(@Param("voyageId")Long voyageId);
+    BigDecimal selectIsPolicy(@Param("voyageId")Long voyageId);
 }

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/service/voyagestockdistribute/VoyageStockDistributeNewServiceImpl.java

@@ -253,17 +253,23 @@ public class VoyageStockDistributeNewServiceImpl implements VoyageStockDistribut
             BigDecimal num = idNumMap.get(item.getVoyageId());
             BigDecimal roomModelNum = idRoomModelNumMap.get(item.getVoyageId());
             // 根据航次查询是否有营销政策（暂时包含当天）
-            Long policyNum = voyageStockDistributeNewMapper.selectIsPolicy(item.getVoyageId());
+            BigDecimal policyNum = voyageStockDistributeNewMapper.selectIsPolicy(item.getVoyageId());
             VoyageStockDistributeNewPageRespVO respVO = new VoyageStockDistributeNewPageRespVO();
             respVO.setVoyageId(item.getVoyageId());
             respVO.setVoyageName(item.getVoyageName());
             respVO.setShipId(item.getShipId());
             respVO.setShipName(item.getShipName());
-            if(policyNum==0){
-                respVO.setIsPolicy(YesOrNoEnum.NO.getType());
-            }else{
-                respVO.setIsPolicy(YesOrNoEnum.YES.getType());
+            if(policyNum!= null){
+                respVO.setPolicyNum(policyNum);
+            }else {
+                respVO.setPolicyNum(BigDecimal.ZERO);
             }
+
+//            if(policyNum==0){
+//                respVO.setIsPolicy(YesOrNoEnum.NO.getType());
+//            }else{
+//                respVO.setIsPolicy(YesOrNoEnum.YES.getType());
+//            }
             VoyageStockDistributeNewDetailReqVO detailReqVO = new VoyageStockDistributeNewDetailReqVO();
             detailReqVO.setVoyageId(item.getVoyageId());
             detailReqVO.setType(item.getType());