Merge branch 'dev_pfh'

# Conflicts:
#	custom-server-app/src/main/java/com/jomalls/custom/app/service/product/CustomProductFactoryPriceIntervalRelService.java
#	custom-server-app/src/main/java/com/jomalls/custom/app/service/product/CustomProductWarehouseRelService.java

custom-server-app/src/main/java/com/jomalls/custom/app/service/impl/product/CustomProductBlacklistServiceImpl.java

 package com.jomalls.custom.app.service.impl.product;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.jomalls.custom.app.exception.ServiceException;
 import com.jomalls.custom.app.vo.product.CustomProductBlacklistPageVO;
 import com.jomalls.custom.app.vo.product.CustomProductBlacklistVO;
@@ -16,7 +18,9 @@ import org.springframework.dao.DuplicateKeyException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -93,4 +97,82 @@ public class CustomProductBlacklistServiceImpl implements CustomProductBlacklist
         customProductBlacklistDomainService.removeById(id);
     }
 
+
+    /**
+     * 批量保存黑名单
+     *
+     * @param productId   产品ID
+     * @param diyUserIds  DIY用户ID列表
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void saveBatch(Integer productId, List<Integer> diyUserIds) {
+        customProductBlacklistDomainService.remove(new LambdaQueryWrapper<CustomProductBlacklistEntity>()
+                .eq(CustomProductBlacklistEntity::getProductId, productId));
+        if (CollectionUtils.isEmpty(diyUserIds)) {
+            return;
+        }
+        List<CustomProductBlacklistEntity> blacklistEntities = diyUserIds.stream()
+                .map(diyUserId -> {
+                    CustomProductBlacklistEntity entity = new CustomProductBlacklistEntity();
+                    entity.setProductId(productId);
+                    entity.setDiyUserId(diyUserId);
+                    return entity;
+                })
+                .collect(Collectors.toList());
+        customProductBlacklistDomainService.saveBatch(blacklistEntities);
+    }
+
+    /**
+     * 批量保存多个产品的黑名单
+     * @param productIds
+     * @param diyUserIds
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void saveBatchProduct(List<Integer> productIds, List<Integer> diyUserIds) {
+        if (CollectionUtils.isEmpty(productIds) || CollectionUtils.isEmpty(diyUserIds)) {
+            return;
+        }
+        // 1. 删除这些产品下现有的所有黑名单
+        customProductBlacklistDomainService.remove(new LambdaQueryWrapper<CustomProductBlacklistEntity>()
+                .in(CustomProductBlacklistEntity::getProductId, productIds));
+        List<CustomProductBlacklistEntity> tempList = new ArrayList<>();
+        for (Integer productId : productIds) {
+            for (Integer diyUserId : diyUserIds) {
+                CustomProductBlacklistEntity entity = new CustomProductBlacklistEntity();
+                entity.setProductId(productId);
+                entity.setDiyUserId(diyUserId);
+                tempList.add(entity);
+            }
+        }
+        if (!tempList.isEmpty()) {
+            customProductBlacklistDomainService.saveBatch(tempList);
+        }
+    }
+
+    /**
+     * 根据产品ID获取DIY用户ID列表
+     * @param productId
+     * @return
+     */
+    @Override
+    public List<Integer> getDiyUserIdsByProductId(Integer productId) {
+        if (productId == null) {
+            return new ArrayList<>();
+        }
+        List<CustomProductBlacklistEntity> list = customProductBlacklistDomainService.list(
+                new LambdaQueryWrapper<CustomProductBlacklistEntity>()
+                        .eq(CustomProductBlacklistEntity::getProductId, productId)
+                        .select(CustomProductBlacklistEntity::getDiyUserId)
+        );
+        if (CollectionUtils.isEmpty(list)) {
+            return new ArrayList<>();
+        }
+        return list.stream()
+                .map(CustomProductBlacklistEntity::getDiyUserId)
+                .filter(Objects::nonNull)
+                .collect(Collectors.toList());
+    }
+
 }

custom-server-app/src/main/java/com/jomalls/custom/app/service/impl/product/CustomProductFactoryPriceIntervalRelServiceImpl.java

 package com.jomalls.custom.app.service.impl.product;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.jomalls.custom.app.exception.ServiceException;
 import com.jomalls.custom.app.vo.product.CustomProductFactoryPriceIntervalRelPageVO;
 import com.jomalls.custom.app.vo.product.CustomProductFactoryPriceIntervalRelVO;
@@ -93,4 +95,24 @@ public class CustomProductFactoryPriceIntervalRelServiceImpl implements CustomPr
         customProductFactoryPriceIntervalRelDomainService.removeById(id);
     }
 
+    /**
+     * 批量保存工厂价格区间关联
+     * 逻辑：先删除该产品下的所有旧数据，再批量插入新数据
+     * @param data      待保存的数据列表
+     * @param productId 产品ID
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void saveBatch(List<CustomProductFactoryPriceIntervalRelEntity> data, Integer productId) {
+        customProductFactoryPriceIntervalRelDomainService.remove(new LambdaQueryWrapper<CustomProductFactoryPriceIntervalRelEntity>()
+                .eq(CustomProductFactoryPriceIntervalRelEntity::getProductId, productId));
+
+        if (CollectionUtils.isEmpty(data)) {
+            return;
+        }
+        for (CustomProductFactoryPriceIntervalRelEntity item : data) {
+            item.setProductId(productId);
+        }
+        customProductFactoryPriceIntervalRelDomainService.saveBatch(data);
+    }
+
 }

custom-server-app/src/main/java/com/jomalls/custom/app/service/impl/product/CustomProductWarehouseRelServiceImpl.java

 package com.jomalls.custom.app.service.impl.product;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.jomalls.custom.app.exception.ServiceException;
 import com.jomalls.custom.app.vo.product.CustomProductWarehouseRelPageVO;
 import com.jomalls.custom.app.vo.product.CustomProductWarehouseRelVO;
@@ -16,6 +18,7 @@ import org.springframework.dao.DuplicateKeyException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -93,4 +96,74 @@ public class CustomProductWarehouseRelServiceImpl implements CustomProductWareho
         customProductWarehouseRelDomainService.removeById(id);
     }
 
+    /**
+     * 根据仓库ID获取关联列表
+     */
+    @Override
+    public List<CustomProductWarehouseRelEntity> getListByWareHouseId(Long warehouseId) {
+        return customProductWarehouseRelDomainService.list(new LambdaQueryWrapper<CustomProductWarehouseRelEntity>()
+                .eq(CustomProductWarehouseRelEntity::getWarehouseId, warehouseId));
+    }
+
+    /**
+     * 根据产品ID获取关联列表
+     */
+    @Override
+    public List<CustomProductWarehouseRelEntity> getListByProductId(Long productId) {
+        return customProductWarehouseRelDomainService.list(new LambdaQueryWrapper<CustomProductWarehouseRelEntity>()
+                .eq(CustomProductWarehouseRelEntity::getProductId, productId));
+    }
+
+    /**
+     * 根据产品ID获取仓库ID列表
+     */
+    @Override
+    public List<Long> getWarehouseIdsByProductId(Long productId) {
+        List<CustomProductWarehouseRelEntity> rels = customProductWarehouseRelDomainService.list(new LambdaQueryWrapper<CustomProductWarehouseRelEntity>()
+                .eq(CustomProductWarehouseRelEntity::getProductId, productId)
+                .select(CustomProductWarehouseRelEntity::getWarehouseId)); // 只查询需要的字段以提高性能
+
+        if (CollectionUtils.isEmpty(rels)) {
+            return null;
+        }
+
+        return rels.stream()
+                .map(CustomProductWarehouseRelEntity::getWarehouseId)
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * 根据产品ID删除关联
+     * 注意：原 TS 代码支持手动传入 transaction，Java 中通常使用 @Transactional 注解管理事务
+     */
+    @Override
+    public void deleteByProductId(Integer productId) {
+        customProductWarehouseRelDomainService.remove(new LambdaQueryWrapper<CustomProductWarehouseRelEntity>()
+                .eq(CustomProductWarehouseRelEntity::getProductId, productId));
+    }
+
+    /**
+     * 批量保存产品与仓库的关联
+     * 逻辑：先删除该产品现有的所有关联，再批量插入新的
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void saveBatch(Integer productId, List<Long> warehouseIds) {
+        this.deleteByProductId(productId);
+
+        if (CollectionUtils.isEmpty(warehouseIds)) {
+            return;
+        }
+
+        List<CustomProductWarehouseRelEntity> relList = new ArrayList<>();
+        for (Long warehouseId : warehouseIds) {
+            CustomProductWarehouseRelEntity rel = new CustomProductWarehouseRelEntity();
+            rel.setProductId(productId);
+            rel.setWarehouseId(warehouseId);
+            relList.add(rel);
+        }
+
+        customProductWarehouseRelDomainService.saveBatch(relList);
+    }
+
 }

custom-server-app/src/main/java/com/jomalls/custom/app/service/product/CustomProductBlacklistService.java

@@ -59,5 +59,26 @@ public interface CustomProductBlacklistService {
      */
     void deleteById(Integer id);
 
+    /**
+     * 批量保存黑名单
+     *
+     * @param productId   产品ID
+     * @param diyUserIds  DIY用户ID列表
+     */
+    void saveBatch(Integer productId, List<Integer> diyUserIds);
+
+    /**
+     * 批量保存多个产品的黑名单
+     * @param productIds
+     * @param diyUserIds
+     */
+    void saveBatchProduct(List<Integer> productIds, List<Integer> diyUserIds);
+    /**
+     * 根据产品ID获取DIY用户ID列表
+     * @param productId
+     * @return
+     */
+    List<Integer> getDiyUserIdsByProductId(Integer productId);
+
 }
 

custom-server-app/src/main/java/com/jomalls/custom/app/service/product/CustomProductWarehouseRelService.java

@@ -59,5 +59,31 @@ public interface CustomProductWarehouseRelService {
      */
     void deleteById(Integer id);
 
+    /**
+     * 根据仓库ID获取关联列表
+     */
+    List<CustomProductWarehouseRelEntity> getListByWareHouseId(Long warehouseId);
+    /**
+     * 根据产品ID获取关联列表
+     */
+    List<CustomProductWarehouseRelEntity> getListByProductId(Long productId);
+
+    /**
+     * 根据产品ID获取仓库ID列表
+     */
+     List<Long> getWarehouseIdsByProductId(Long productId);
+
+    /**
+     * 批量保存产品与仓库的关联
+     * 逻辑：先删除该产品现有的所有关联，再批量插入新的
+     */
+    void saveBatch(Integer productId, List<Long> warehouseIds);
+
+    /**
+     * 根据产品ID删除关联
+     * 注意：原 TS 代码支持手动传入 transaction，Java 中通常使用 @Transactional 注解管理事务
+     */
+    void deleteByProductId(Integer productId);
+
 }