Commit e41db33a by zhangxingmin

push

parent 9d5691e2
...@@ -15,6 +15,8 @@ import org.springframework.validation.annotation.Validated; ...@@ -15,6 +15,8 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import javax.validation.constraints.NotBlank;
/** /**
* 公告佣比率规格明细信息 * 公告佣比率规格明细信息
* *
...@@ -109,4 +111,14 @@ public class ApiAnnouncementCommissionRatioController implements ApiAnnouncement ...@@ -109,4 +111,14 @@ public class ApiAnnouncementCommissionRatioController implements ApiAnnouncement
public Result copy(String announcementCommissionRatioBizId) { public Result copy(String announcementCommissionRatioBizId) {
return apiAnnouncementCommissionRatioService.copy(announcementCommissionRatioBizId); return apiAnnouncementCommissionRatioService.copy(announcementCommissionRatioBizId);
} }
/**
* 根据条件查询是否有公告佣比率规格明细信息数据
* @param productLaunchBizId 产品上架信息表唯一业务ID不
* @return
*/
@Override
public Result<Boolean> isData(String productLaunchBizId) {
return apiAnnouncementCommissionRatioService.isData(productLaunchBizId);
}
} }
...@@ -27,5 +27,7 @@ public interface ApiAnnouncementCommissionRatioService { ...@@ -27,5 +27,7 @@ public interface ApiAnnouncementCommissionRatioService {
Result copy(String announcementCommissionRatioBizId); Result copy(String announcementCommissionRatioBizId);
Result<Boolean> isData(String productLaunchBizId);
Result<AnnouncementCommissionRatio> checkAnnouncementCommissionRatioIsExist(String announcementCommissionRatioBizId); Result<AnnouncementCommissionRatio> checkAnnouncementCommissionRatioIsExist(String announcementCommissionRatioBizId);
} }
...@@ -17,7 +17,9 @@ import com.yd.product.feign.request.announcementcommissionratio.ApiAnnouncementC ...@@ -17,7 +17,9 @@ import com.yd.product.feign.request.announcementcommissionratio.ApiAnnouncementC
import com.yd.product.feign.response.announcementcommissionratio.ApiAnnouncementCommissionRatioDetailResponse; import com.yd.product.feign.response.announcementcommissionratio.ApiAnnouncementCommissionRatioDetailResponse;
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.model.AnnouncementSpecies;
import com.yd.product.service.service.IAnnouncementCommissionRatioService; import com.yd.product.service.service.IAnnouncementCommissionRatioService;
import com.yd.product.service.service.IAnnouncementSpeciesService;
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;
...@@ -35,6 +37,9 @@ public class ApiAnnouncementCommissionRatioServiceImpl implements ApiAnnouncemen ...@@ -35,6 +37,9 @@ public class ApiAnnouncementCommissionRatioServiceImpl implements ApiAnnouncemen
private IAnnouncementCommissionRatioService iAnnouncementCommissionRatioService; private IAnnouncementCommissionRatioService iAnnouncementCommissionRatioService;
@Autowired @Autowired
private IAnnouncementSpeciesService iAnnouncementSpeciesService;
@Autowired
private ApiAnnouncementSpeciesService apiAnnouncementSpeciesService; private ApiAnnouncementSpeciesService apiAnnouncementSpeciesService;
/** /**
...@@ -177,6 +182,25 @@ public class ApiAnnouncementCommissionRatioServiceImpl implements ApiAnnouncemen ...@@ -177,6 +182,25 @@ public class ApiAnnouncementCommissionRatioServiceImpl implements ApiAnnouncemen
} }
/** /**
* 根据条件查询是否有公告佣比率规格明细信息数据
* @param productLaunchBizId 产品上架信息表唯一业务ID不
* @return
*/
@Override
public Result<Boolean> isData(String productLaunchBizId) {
List<AnnouncementSpecies> speciesList = iAnnouncementSpeciesService.queryList(productLaunchBizId);
if (CollectionUtils.isEmpty(speciesList)){
return Result.success(false);
}
List<String> announcementSpeciesBizIdList = speciesList.stream().map(AnnouncementSpecies::getAnnouncementSpeciesBizId).collect(Collectors.toList());
List<AnnouncementCommissionRatio> commissionRatioList = iAnnouncementCommissionRatioService.queryList(announcementSpeciesBizIdList);
if (CollectionUtils.isEmpty(commissionRatioList)) {
return Result.success(false);
}
return Result.success(true);
}
/**
* 校验公告佣比率规格明细信息是否存在 * 校验公告佣比率规格明细信息是否存在
* @param announcementCommissionRatioBizId * @param announcementCommissionRatioBizId
* @return * @return
......
...@@ -84,4 +84,12 @@ public interface ApiAnnouncementCommissionRatioFeignClient { ...@@ -84,4 +84,12 @@ public interface ApiAnnouncementCommissionRatioFeignClient {
*/ */
@PutMapping("/copy") @PutMapping("/copy")
Result copy(@NotBlank(message = "公告佣比率规格明细表唯一业务ID不能为空") @RequestParam(value = "announcementCommissionRatioBizId") String announcementCommissionRatioBizId); Result copy(@NotBlank(message = "公告佣比率规格明细表唯一业务ID不能为空") @RequestParam(value = "announcementCommissionRatioBizId") String announcementCommissionRatioBizId);
/**
* 根据条件查询是否有公告佣比率规格明细信息数据
* @param productLaunchBizId 产品上架信息表唯一业务ID不
* @return
*/
@GetMapping("/is/data")
Result<Boolean> isData(@NotBlank(message = "产品上架信息表唯一业务ID不能为空") @RequestParam(value = "productLaunchBizId") String productLaunchBizId);
} }
...@@ -62,6 +62,11 @@ public class ApiAnnouncementCommissionRatioFeignFallbackFactory implements Fallb ...@@ -62,6 +62,11 @@ public class ApiAnnouncementCommissionRatioFeignFallbackFactory implements Fallb
public Result copy(String announcementCommissionRatioBizId) { public Result copy(String announcementCommissionRatioBizId) {
return null; return null;
} }
@Override
public Result<Boolean> isData(String productLaunchBizId) {
return null;
}
}; };
} }
} }
...@@ -24,5 +24,7 @@ public interface IAnnouncementCommissionRatioService extends IService<Announceme ...@@ -24,5 +24,7 @@ public interface IAnnouncementCommissionRatioService extends IService<Announceme
AnnouncementCommissionRatio queryOne(String announcementCommissionRatioBizId); AnnouncementCommissionRatio queryOne(String announcementCommissionRatioBizId);
List<AnnouncementCommissionRatio> queryList(List<String> announcementSpeciesBizIdList);
Boolean del(List<String> announcementSpeciesBizIdList); Boolean del(List<String> announcementSpeciesBizIdList);
} }
...@@ -37,6 +37,11 @@ public class AnnouncementCommissionRatioServiceImpl extends ServiceImpl<Announce ...@@ -37,6 +37,11 @@ public class AnnouncementCommissionRatioServiceImpl extends ServiceImpl<Announce
} }
@Override @Override
public List<AnnouncementCommissionRatio> queryList(List<String> announcementSpeciesBizIdList) {
return this.baseMapper.selectList(new LambdaQueryWrapper<AnnouncementCommissionRatio>().in(AnnouncementCommissionRatio::getAnnouncementSpeciesBizId,announcementSpeciesBizIdList));
}
@Override
public Boolean del(List<String> announcementSpeciesBizIdList) { public Boolean del(List<String> announcementSpeciesBizIdList) {
return this.remove(new LambdaQueryWrapper<AnnouncementCommissionRatio>() return this.remove(new LambdaQueryWrapper<AnnouncementCommissionRatio>()
.in(AnnouncementCommissionRatio::getAnnouncementSpeciesBizId,announcementSpeciesBizIdList)); .in(AnnouncementCommissionRatio::getAnnouncementSpeciesBizId,announcementSpeciesBizIdList));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment