Merge remote-tracking branch 'origin/main'

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

@@ -448,9 +448,9 @@ public class VoyageApiImpl implements VoyageApi {
                 } else {
                     voyageStockDetailLogDO.setVirtualNum(useNum.subtract(item.getRealTotalNum()));
                     voyageStockDetailLogDO.setRealNum(useNum);
-                    item.setRealTotalNum(BigDecimal.ZERO);
                     // 扣实际房间数
                     item.setVirtualNum(item.getVirtualNum().subtract(useNum.subtract(item.getRealTotalNum())));
+                    item.setRealTotalNum(BigDecimal.ZERO);
                 }
                 // 加预定房间数
                 if (item.getBookNum() != null) {
@@ -476,9 +476,9 @@ public class VoyageApiImpl implements VoyageApi {
             } else {
                 voyageStockLogDO.setRealNum(stockDO.getRealTotalNum());
                 voyageStockLogDO.setVirtualNum(totalUseNum.subtract(voyageStockLogDO.getRealNum()));
-                stockDO.setRealTotalNum(BigDecimal.ZERO);
                 // 扣虚拟房间数
                 stockDO.setVirtualNum(stockDO.getVirtualNum().subtract(totalUseNum.subtract(stockDO.getRealTotalNum())));
+                stockDO.setRealTotalNum(BigDecimal.ZERO);
             }
             // 加预定房间数
             stockDO.setBookNum(stockDO.getBookNum().add(totalUseNum));
@@ -890,9 +890,9 @@ public class VoyageApiImpl implements VoyageApi {
             } else {
                 voyageStockLogDO.setVirtualNum(stockDO.getVirtualNum());
                 voyageStockLogDO.setRealNum(totalUseNum.subtract(voyageStockLogDO.getVirtualNum()));
-                stockDO.setVirtualNum(BigDecimal.ZERO);
                 // 扣实际房间数
                 stockDO.setRealTotalNum(stockDO.getRealTotalNum().subtract(totalUseNum.subtract(stockDO.getVirtualNum())));
+                stockDO.setVirtualNum(BigDecimal.ZERO);
             }
             // 加预定房间数
             stockDO.setBookNum(stockDO.getBookNum().add(totalUseNum));