push

yd-product-api/src/main/java/com/yd/product/api/service/impl/ApiAnnouncementSpeciesServiceImpl.java

@@ -73,10 +73,16 @@ public class ApiAnnouncementSpeciesServiceImpl implements ApiAnnouncementSpecies
         }
         }
         //先删后新增
         //先删后新增
         //删除公告佣比率规格明细信息
         //删除公告佣比率规格明细信息
-        //查询公告佣比率规格信息列表业务ID
-//        iAnnouncementSpeciesService.delByProductLaunchBizId(request.getProductLaunchBizId());
-
+        List<AnnouncementSpecies> speciesList = iAnnouncementSpeciesService.queryList(request.getProductLaunchBizId());
+        if (!CollectionUtils.isEmpty(speciesList)) {
+            List<String> announcementSpeciesBizIdList = speciesList.stream()
+                    .map(AnnouncementSpecies::getAnnouncementSpeciesBizId)
+                    .collect(Collectors.toList());
+            iAnnouncementCommissionRatioService.del(announcementSpeciesBizIdList);
+        }
         //删除公告佣比率规格信息
         //删除公告佣比率规格信息
+        iAnnouncementSpeciesService.delByProductLaunchBizId(request.getProductLaunchBizId());
+
         //查询规格价格配置列表 -> 新增公告佣比率规格数据
         //查询规格价格配置列表 -> 新增公告佣比率规格数据
         List<AnnouncementSpecies> saveList = apiSpeciesPriceDtoList.stream().map(dto -> {
         List<AnnouncementSpecies> saveList = apiSpeciesPriceDtoList.stream().map(dto -> {
             AnnouncementSpecies species = new AnnouncementSpecies();
             AnnouncementSpecies species = new AnnouncementSpecies();

yd-product-api/src/main/java/com/yd/product/api/service/impl/ApiExpectedSpeciesServiceImpl.java

@@ -17,6 +17,7 @@ import com.yd.product.feign.request.expectedspecies.ApiExpectedSpeciesPageReques
 import com.yd.product.feign.response.expectedspecies.ApiExpectedSpeciesPageResponse;
 import com.yd.product.feign.response.expectedspecies.ApiExpectedSpeciesPageResponse;
 import com.yd.product.service.model.AnnouncementSpecies;
 import com.yd.product.service.model.AnnouncementSpecies;
 import com.yd.product.service.model.ExpectedSpecies;
 import com.yd.product.service.model.ExpectedSpecies;
+import com.yd.product.service.service.IExpectedCommissionRatioService;
 import com.yd.product.service.service.IExpectedSpeciesService;
 import com.yd.product.service.service.IExpectedSpeciesService;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -42,6 +43,9 @@ public class ApiExpectedSpeciesServiceImpl implements ApiExpectedSpeciesService
     @Autowired
     @Autowired
     private ApiSpeciesSettingService apiSpeciesSettingService;
     private ApiSpeciesSettingService apiSpeciesSettingService;
 
 
+    @Autowired
+    private IExpectedCommissionRatioService iExpectedCommissionRatioService;
+
     /**
     /**
      * 分页列表查询-来佣比率规格信息
      * 分页列表查询-来佣比率规格信息
      * @param request
      * @param request
@@ -68,6 +72,15 @@ public class ApiExpectedSpeciesServiceImpl implements ApiExpectedSpeciesService
         if (CollectionUtils.isEmpty(apiSpeciesPriceDtoList)) {
         if (CollectionUtils.isEmpty(apiSpeciesPriceDtoList)) {
             throw new BusinessException("导入的数据不存在");
             throw new BusinessException("导入的数据不存在");
         }
         }
+        List<ExpectedSpecies> expectedSpeciesList = iExpectedSpeciesService.queryList(request.getProductLaunchBizId());
+        if (!CollectionUtils.isEmpty(expectedSpeciesList)) {
+            List<String> expectedSpeciesBizIdList = expectedSpeciesList.stream()
+                    .map(ExpectedSpecies::getExpectedSpeciesBizId)
+                    .collect(Collectors.toList());
+            iExpectedCommissionRatioService.del(expectedSpeciesBizIdList);
+        }
+        iExpectedSpeciesService.del(request.getProductLaunchBizId());
+
         //查询规格价格配置列表 -> 新增来佣比率规格数据
         //查询规格价格配置列表 -> 新增来佣比率规格数据
         List<ExpectedSpecies> saveList = apiSpeciesPriceDtoList.stream().map(dto -> {
         List<ExpectedSpecies> saveList = apiSpeciesPriceDtoList.stream().map(dto -> {
             ExpectedSpecies species = new ExpectedSpecies();
             ExpectedSpecies species = new ExpectedSpecies();

yd-product-api/src/main/java/com/yd/product/api/service/impl/ApiSpeciesSettingServiceImpl.java

@@ -9,16 +9,14 @@ import com.yd.product.feign.dto.ApiSpeciesTypeDto;
 import com.yd.product.service.dto.SpeciesSettingDto;
 import com.yd.product.service.dto.SpeciesSettingDto;
 import com.yd.product.service.model.SpeciesSetting;
 import com.yd.product.service.model.SpeciesSetting;
 import com.yd.product.service.service.ISpeciesSettingService;
 import com.yd.product.service.service.ISpeciesSettingService;
+import com.yd.user.feign.response.mdcountry.ApiMdCountryVO;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.CollectionUtils;
 
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
 @Slf4j
 @Slf4j
@@ -69,6 +67,7 @@ public class ApiSpeciesSettingServiceImpl implements ApiSpeciesSettingService {
         if (!CollectionUtils.isEmpty(speciesSettingList)) {
         if (!CollectionUtils.isEmpty(speciesSettingList)) {
             // 按规格类型分组
             // 按规格类型分组
             Map<String, List<SpeciesSetting>> speciesSettingByType = speciesSettingList.stream()
             Map<String, List<SpeciesSetting>> speciesSettingByType = speciesSettingList.stream()
+                    .sorted(Comparator.comparing(SpeciesSetting::getId))
                     .collect(Collectors.groupingBy(SpeciesSetting::getTypeName));
                     .collect(Collectors.groupingBy(SpeciesSetting::getTypeName));
 
 
             // 为每个规格类型创建DTO
             // 为每个规格类型创建DTO

yd-product-service/src/main/java/com/yd/product/service/service/IAnnouncementCommissionRatioService.java

@@ -7,6 +7,8 @@ import com.yd.product.feign.response.announcementcommissionratio.ApiAnnouncement
 import com.yd.product.service.model.AnnouncementCommissionRatio;
 import com.yd.product.service.model.AnnouncementCommissionRatio;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 
+import java.util.List;
+
 /**
 /**
  * <p>
  * <p>
  * 公告佣比率规格明细表 服务类
  * 公告佣比率规格明细表 服务类
@@ -21,4 +23,6 @@ public interface IAnnouncementCommissionRatioService extends IService<Announceme
                                                            ApiAnnouncementCommissionRatioPageRequest request);
                                                            ApiAnnouncementCommissionRatioPageRequest request);
 
 
     AnnouncementCommissionRatio queryOne(String announcementCommissionRatioBizId);
     AnnouncementCommissionRatio queryOne(String announcementCommissionRatioBizId);
+
+    Boolean del(List<String> announcementSpeciesBizIdList);
 }
 }

yd-product-service/src/main/java/com/yd/product/service/service/IExpectedCommissionRatioService.java

@@ -7,6 +7,8 @@ import com.yd.product.feign.response.expectedcommissionratio.ApiExpectedCommissi
 import com.yd.product.service.model.ExpectedCommissionRatio;
 import com.yd.product.service.model.ExpectedCommissionRatio;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 
+import java.util.List;
+
 /**
 /**
  * <p>
  * <p>
  * 预计来佣比率表（新表） 服务类
  * 预计来佣比率表（新表） 服务类
@@ -21,4 +23,6 @@ public interface IExpectedCommissionRatioService extends IService<ExpectedCommis
                                                        ApiExpectedCommissionRatioPageRequest request);
                                                        ApiExpectedCommissionRatioPageRequest request);
 
 
     ExpectedCommissionRatio queryOne(String expectedCommissionRatioBizId);
     ExpectedCommissionRatio queryOne(String expectedCommissionRatioBizId);
+
+    Boolean del(List<String> expectedSpeciesBizIdList);
 }
 }

yd-product-service/src/main/java/com/yd/product/service/service/IExpectedSpeciesService.java

@@ -7,6 +7,8 @@ import com.yd.product.feign.request.expectedspecies.ApiExpectedSpeciesPageReques
 import com.yd.product.feign.response.expectedspecies.ApiExpectedSpeciesPageResponse;
 import com.yd.product.feign.response.expectedspecies.ApiExpectedSpeciesPageResponse;
 import com.yd.product.service.model.ExpectedSpecies;
 import com.yd.product.service.model.ExpectedSpecies;
 
 
+import java.util.List;
+
 /**
 /**
  * <p>
  * <p>
  * 来佣比率规格表 服务类
  * 来佣比率规格表 服务类
@@ -21,4 +23,8 @@ public interface IExpectedSpeciesService extends IService<ExpectedSpecies> {
                                                ApiExpectedSpeciesPageRequest request);
                                                ApiExpectedSpeciesPageRequest request);
 
 
     ExpectedSpecies queryOne(String expectedSpeciesBizId);
     ExpectedSpecies queryOne(String expectedSpeciesBizId);
+
+    List<ExpectedSpecies> queryList(String productLaunchBizId);
+
+    Boolean del(String productLaunchBizId);
 }
 }

yd-product-service/src/main/java/com/yd/product/service/service/impl/AnnouncementCommissionRatioServiceImpl.java

@@ -7,10 +7,13 @@ import com.yd.product.feign.request.announcementcommissionratio.ApiAnnouncementC
 import com.yd.product.feign.response.announcementcommissionratio.ApiAnnouncementCommissionRatioPageResponse;
 import com.yd.product.feign.response.announcementcommissionratio.ApiAnnouncementCommissionRatioPageResponse;
 import com.yd.product.service.model.AnnouncementCommissionRatio;
 import com.yd.product.service.model.AnnouncementCommissionRatio;
 import com.yd.product.service.dao.AnnouncementCommissionRatioMapper;
 import com.yd.product.service.dao.AnnouncementCommissionRatioMapper;
+import com.yd.product.service.model.AnnouncementSpecies;
 import com.yd.product.service.service.IAnnouncementCommissionRatioService;
 import com.yd.product.service.service.IAnnouncementCommissionRatioService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
+import java.util.List;
+
 /**
 /**
  * <p>
  * <p>
  * 公告佣比率规格明细表 服务实现类
  * 公告佣比率规格明细表 服务实现类
@@ -32,4 +35,10 @@ public class AnnouncementCommissionRatioServiceImpl extends ServiceImpl<Announce
     public AnnouncementCommissionRatio queryOne(String announcementCommissionRatioBizId) {
     public AnnouncementCommissionRatio queryOne(String announcementCommissionRatioBizId) {
         return this.getOne(new LambdaQueryWrapper<AnnouncementCommissionRatio>().eq(AnnouncementCommissionRatio::getAnnouncementCommissionRatioBizId,announcementCommissionRatioBizId));
         return this.getOne(new LambdaQueryWrapper<AnnouncementCommissionRatio>().eq(AnnouncementCommissionRatio::getAnnouncementCommissionRatioBizId,announcementCommissionRatioBizId));
     }
     }
+
+    @Override
+    public Boolean del(List<String> announcementSpeciesBizIdList) {
+        return this.remove(new LambdaQueryWrapper<AnnouncementCommissionRatio>()
+                .in(AnnouncementCommissionRatio::getAnnouncementSpeciesBizId,announcementSpeciesBizIdList));
+    }
 }
 }

yd-product-service/src/main/java/com/yd/product/service/service/impl/AnnouncementSpeciesServiceImpl.java

@@ -37,12 +37,15 @@ public class AnnouncementSpeciesServiceImpl extends ServiceImpl<AnnouncementSpec
 
 
     @Override
     @Override
     public List<AnnouncementSpecies> queryList(String productLaunchBizId) {
     public List<AnnouncementSpecies> queryList(String productLaunchBizId) {
-        return null;
+        return this.list(new LambdaQueryWrapper<AnnouncementSpecies>()
+                .eq(AnnouncementSpecies::getProductLaunchBizId,productLaunchBizId));
     }
     }
 
 
     @Override
     @Override
     public Boolean delByProductLaunchBizId(String productLaunchBizId) {
     public Boolean delByProductLaunchBizId(String productLaunchBizId) {
-        return null;
+        return this.remove(new LambdaQueryWrapper<AnnouncementSpecies>()
+                .eq(AnnouncementSpecies::getProductLaunchBizId,productLaunchBizId));
     }
     }
 
 
+
 }
 }

yd-product-service/src/main/java/com/yd/product/service/service/impl/ExpectedCommissionRatioServiceImpl.java

@@ -11,6 +11,8 @@ import com.yd.product.service.service.IExpectedCommissionRatioService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
+import java.util.List;
+
 /**
 /**
  * <p>
  * <p>
  * 预计来佣比率表（新表） 服务实现类
  * 预计来佣比率表（新表） 服务实现类
@@ -32,4 +34,10 @@ public class ExpectedCommissionRatioServiceImpl extends ServiceImpl<ExpectedComm
     public ExpectedCommissionRatio queryOne(String expectedCommissionRatioBizId) {
     public ExpectedCommissionRatio queryOne(String expectedCommissionRatioBizId) {
         return this.getOne(new LambdaQueryWrapper<ExpectedCommissionRatio>().eq(ExpectedCommissionRatio::getExpectedCommissionRatioBizId,expectedCommissionRatioBizId));
         return this.getOne(new LambdaQueryWrapper<ExpectedCommissionRatio>().eq(ExpectedCommissionRatio::getExpectedCommissionRatioBizId,expectedCommissionRatioBizId));
     }
     }
+
+    @Override
+    public Boolean del(List<String> expectedSpeciesBizIdList) {
+        return this.remove(new LambdaQueryWrapper<ExpectedCommissionRatio>()
+                .in(ExpectedCommissionRatio::getExpectedSpeciesBizId,expectedSpeciesBizIdList));
+    }
 }
 }

yd-product-service/src/main/java/com/yd/product/service/service/impl/ExpectedSpeciesServiceImpl.java

@@ -11,6 +11,8 @@ import com.yd.product.service.model.ExpectedSpecies;
 import com.yd.product.service.service.IExpectedSpeciesService;
 import com.yd.product.service.service.IExpectedSpeciesService;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
+import java.util.List;
+
 /**
 /**
  * <p>
  * <p>
  * 来佣比率规格表 服务实现类
  * 来佣比率规格表 服务实现类
@@ -35,4 +37,16 @@ public class ExpectedSpeciesServiceImpl extends ServiceImpl<ExpectedSpeciesMappe
                 .last(" limit 1 ")
                 .last(" limit 1 ")
         );
         );
     }
     }
+
+    @Override
+    public List<ExpectedSpecies> queryList(String productLaunchBizId) {
+        return this.list(new LambdaQueryWrapper<ExpectedSpecies>()
+                .eq(ExpectedSpecies::getProductLaunchBizId,productLaunchBizId));
+    }
+
+    @Override
+    public Boolean del(String productLaunchBizId) {
+        return this.remove(new LambdaQueryWrapper<ExpectedSpecies>()
+                .eq(ExpectedSpecies::getProductLaunchBizId,productLaunchBizId));
+    }
 }
 }