bug修改

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

@@ -272,6 +272,9 @@ public class VoyageApiImpl implements VoyageApi {
                 item.setCanSellNum(item.getCanSellNum().add(totalNumMap.get(key)));
                 item.setRealTotalNum(item.getRealTotalNum().add(realNumMap.get(key)));
                 item.setVirtualNum(item.getVirtualNum().add(virtualNumMap.get(key)));
+                if(item.getTenantId() == null && voyageStockLogDO.getTenantId() != null) {
+                    item.setTenantId(voyageStockLogDO.getTenantId());
+                }
                 if (stockType == 1) {//使用的是共享库存，才退回共享库存
                     item.setShareNum(item.getShareNum().add(totalNumMap.get(key)));
                 }

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/dal/mysql/voyagestock/VoyageStockRoomUsedMapper.java

@@ -3,6 +3,7 @@ package com.yc.ship.module.product.dal.mysql.voyagestock;
 
 import com.yc.ship.framework.mybatis.core.mapper.BaseMapperX;
 import com.yc.ship.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.yc.ship.framework.tenant.core.aop.TenantIgnore;
 import com.yc.ship.module.product.dal.dataobject.voyagestock.VoyageStockRoomUsedDO;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -20,6 +21,7 @@ public interface VoyageStockRoomUsedMapper extends BaseMapperX<VoyageStockRoomUs
      * @param voyageId
      * @return
      */
+    @TenantIgnore
     default List<VoyageStockRoomUsedDO> selectAllUsedList(Long voyageId) {
         return selectList(new LambdaQueryWrapperX<VoyageStockRoomUsedDO>()
                 .eq(VoyageStockRoomUsedDO::getVoyageId, voyageId)
@@ -31,6 +33,7 @@ public interface VoyageStockRoomUsedMapper extends BaseMapperX<VoyageStockRoomUs
      * @param voyageId
      * @return
      */
+    @TenantIgnore
     default List<VoyageStockRoomUsedDO> selectHalfUsedRoom(Long voyageId) {
         return selectList(new LambdaQueryWrapperX<VoyageStockRoomUsedDO>()
                 .eq(VoyageStockRoomUsedDO::getVoyageId, voyageId)

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/dal/mysql/voyagestockdetail/VoyageStockDetailLogMapper.java

@@ -2,6 +2,7 @@ package com.yc.ship.module.product.dal.mysql.voyagestockdetail;
 
 import com.yc.ship.framework.mybatis.core.mapper.BaseMapperX;
 import com.yc.ship.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.yc.ship.framework.tenant.core.aop.TenantIgnore;
 import com.yc.ship.module.product.dal.dataobject.voyagestockdetail.VoyageStockDetailLogDO;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -15,11 +16,13 @@ import java.util.List;
 @Mapper
 public interface VoyageStockDetailLogMapper extends BaseMapperX<VoyageStockDetailLogDO> {
 
+    @TenantIgnore
     default List<VoyageStockDetailLogDO> selectListByOrder(Long orderId) {
         return selectList(new LambdaQueryWrapperX<VoyageStockDetailLogDO>()
                 .eq(VoyageStockDetailLogDO::getOrderId, orderId));
     }
 
+    @TenantIgnore
     default void deleteByOrder(Long orderId) {
         delete(new LambdaQueryWrapperX<VoyageStockDetailLogDO>()
                 .eq(VoyageStockDetailLogDO::getOrderId, orderId));