指定剩余房间数通过后台获取

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/admin/voyagestockdetail/VoyageStockDetailController.java

@@ -202,6 +202,7 @@ public class VoyageStockDetailController {
         sumDetailNewResp.setLockNum(filterList.stream().map(VoyageStockDetailNewRespVO::getLockNum).filter(java.util.Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
         sumDetailNewResp.setOtherNum(filterList.stream().map(VoyageStockDetailNewRespVO::getOtherNum).filter(java.util.Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
         sumDetailNewResp.setAssignRoomNum(filterList.stream().map(VoyageStockDetailNewRespVO::getAssignRoomNum).filter(java.util.Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+        sumDetailNewResp.setAssignSurplusNum(filterList.stream().map(VoyageStockDetailNewRespVO::getAssignSurplusNum).filter(java.util.Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
         list.add(detailNewRespVO);
         list.add(sumDetailNewResp);
         list.stream().forEach(detail -> {

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/admin/voyagestockdetail/vo/VoyageStockDetailNewRespVO.java

@@ -96,4 +96,8 @@ public class VoyageStockDetailNewRespVO {
      * 指定房间数
      */
     private BigDecimal assignRoomNum;
+    /**
+     * 指定剩余房间数
+     */
+    private BigDecimal assignSurplusNum;
 }

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

@@ -64,6 +64,7 @@ public interface VoyageStockDistributeNewMapper extends BaseMapperX<VoyageStockD
     @Select("SELECT" +
             "    SUM(p.book_num + p.num) AS totalNum," +
             "    p.room_model_id as roomModelId," +
+            "    p.num," +
             "    p.floor as floor " +
             "FROM " +
             "    product_voyage_stock_distribute_new p " +

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/service/voyagestockdetail/VoyageStockDetailServiceImpl.java

@@ -222,17 +222,24 @@ public class VoyageStockDetailServiceImpl implements VoyageStockDetailService {
             } else {
                 item.setRoomNum(BigDecimal.ZERO);
             }
-            // 获取指定房间数
+            // 获取指定房间数和剩余房间数
             Map<String, Object> assignRoomData = assignRoomNumMap.get(key);
             if (assignRoomData != null) {
                 Object assignRoomNum = assignRoomData.get("totalNum");
+                Object assignSurplusNum= assignRoomData.get("num");
                 if (assignRoomNum != null) {
                     item.setAssignRoomNum(new BigDecimal(assignRoomNum.toString()));
                 } else {
                     item.setAssignRoomNum(BigDecimal.ZERO);
                 }
+                if(assignSurplusNum!=null){
+                    item.setAssignSurplusNum(new BigDecimal(assignSurplusNum.toString()));
+                }else{
+                    item.setAssignSurplusNum(BigDecimal.ZERO);
+                }
             } else {
                 item.setAssignRoomNum(BigDecimal.ZERO);
+                item.setAssignSurplusNum(BigDecimal.ZERO);
             }
             // 设置留位、锁位、其他数量
             Map<String, Object> lockLeaveData = lockLeaveMap.get(key);