fix: 修改扣库存代码

ship-module-product/ship-module-product-api/src/main/java/com/yc/ship/module/product/api/dto/OrderRoomUseDTO.java

@@ -0,0 +1,18 @@
+package com.yc.ship.module.product.api.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@Schema(description = "订单使用房间详情")
+public class OrderRoomUseDTO {
+
+    @Schema(description = "房间ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+    private Long roomId;
+
+    // 因为这个可能为0.5，为1则完全被使用，为0.5则使用一半
+    @Schema(description = "房间使用数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+    private BigDecimal num;
+}

ship-module-product/ship-module-product-api/src/main/java/com/yc/ship/module/product/api/dto/ReduceStockReqDTO.java

@@ -32,20 +32,6 @@ public class ReduceStockReqDTO {
     private BigDecimal useRoomNum;
 
     @Schema(description = "订单使用房间列表")
-    List<OrderRoomDTO> orderRoomList;
-
-
-    @Data
-    @Schema(description = "订单使用房间详情")
-    public static class OrderRoomDTO {
-
-
-        @Schema(description = "房间ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
-        private Long roomId;
-
-        // 因为这个可能为0.5，为1则完全被使用，为0.5则使用一半
-        @Schema(description = "房间使用数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
-        private BigDecimal num;
-    }
+    List<OrderRoomUseDTO> orderRoomList;
 
 }

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/api/VoyageApiImpl.java

@@ -3,6 +3,7 @@ package com.yc.ship.module.product.api;
 import com.yc.ship.framework.common.exception.ServiceException;
 import com.yc.ship.framework.common.util.collection.CollectionUtils;
 import com.yc.ship.framework.common.util.object.BeanUtils;
+import com.yc.ship.module.product.api.dto.OrderRoomUseDTO;
 import com.yc.ship.module.product.api.dto.ReduceStockReqDTO;
 import com.yc.ship.module.product.controller.admin.voyagestockdistributeNew.vo.VoyageStockDistributeNewDetailReqVO;
 import com.yc.ship.module.product.controller.admin.voyagestockdistributeNew.vo.VoyageStockDistributeNewRespVO;
@@ -10,11 +11,9 @@ import com.yc.ship.module.product.dal.dataobject.voyagestock.VoyageStockDO;
 import com.yc.ship.module.product.dal.dataobject.voyagestock.VoyageStockRoomUsedDO;
 import com.yc.ship.module.product.dal.dataobject.voyagestockdetail.VoyageStockDetailDO;
 import com.yc.ship.module.product.dal.dataobject.voyagestockdistribute.VoyageStockDistributeNewDO;
-import com.yc.ship.module.product.dal.dataobject.voyagestockdistribute.VoyageStockDistributeRoomDO;
 import com.yc.ship.module.product.dal.mysql.voyagestock.VoyageStockMapper;
 import com.yc.ship.module.product.dal.mysql.voyagestock.VoyageStockRoomUsedMapper;
 import com.yc.ship.module.product.dal.mysql.voyagestockdetail.VoyageStockDetailMapper;
-import com.yc.ship.module.product.dal.mysql.voyagestockdistribute.VoyageStockDistributeMapper;
 import com.yc.ship.module.product.dal.mysql.voyagestockdistribute.VoyageStockDistributeNewMapper;
 import com.yc.ship.module.product.enums.DistributorOrStoreEnum;
 import com.yc.ship.module.product.framework.lock.ProductRedisKeyConstants;
@@ -120,8 +119,8 @@ public class VoyageApiImpl implements VoyageApi{
         detailReqVO.setType(type);
         detailReqVO.setObjectId(distributorId);
         List<VoyageStockDistributeNewRespVO> distributeNewRespVOS =  voyageStockDistributeNewService.getDetail(detailReqVO);
-        List<ReduceStockReqDTO.OrderRoomDTO> orderRoomList = reqDTO.getOrderRoomList();//订单使用房间详情
-        List<Long> roomIds = CollectionUtils.convertList(orderRoomList, ReduceStockReqDTO.OrderRoomDTO::getRoomId);
+        List<OrderRoomUseDTO> orderRoomList = reqDTO.getOrderRoomList();//订单使用房间详情
+        List<Long> roomIds = CollectionUtils.convertList(orderRoomList, OrderRoomUseDTO::getRoomId);
         List<RoomRespDTO> roomList = roomApi.getRoomListByIds(roomIds);
         Map<Long, BigDecimal> roomMap = CollectionUtils.convertMap(orderRoomList, item -> item.getRoomId(), item -> item.getNum());
         Map<String, BigDecimal> roomModelFloorNumMap = CollectionUtils.convertMap(roomList,