添加前端传递数据校验
This commit is contained in:
@@ -11,16 +11,14 @@ import cn.ysk.cashier.pojo.product.TbProduct;
|
|||||||
import cn.ysk.cashier.pojo.product.TbProductSku;
|
import cn.ysk.cashier.pojo.product.TbProductSku;
|
||||||
import cn.ysk.cashier.repository.product.TbProductRepository;
|
import cn.ysk.cashier.repository.product.TbProductRepository;
|
||||||
import cn.ysk.cashier.repository.product.TbProductSkuRepository;
|
import cn.ysk.cashier.repository.product.TbProductSkuRepository;
|
||||||
import cn.ysk.cashier.utils.FileUtil;
|
import cn.ysk.cashier.utils.*;
|
||||||
import cn.ysk.cashier.utils.PageUtil;
|
|
||||||
import cn.ysk.cashier.utils.QueryHelp;
|
|
||||||
import cn.ysk.cashier.utils.ValidationUtil;
|
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import cn.ysk.cashier.cons.repository.TbProskuConRepository;
|
import cn.ysk.cashier.cons.repository.TbProskuConRepository;
|
||||||
import cn.ysk.cashier.cons.service.TbProskuConService;
|
import cn.ysk.cashier.cons.service.TbProskuConService;
|
||||||
import cn.ysk.cashier.cons.service.dto.TbProskuConDto;
|
import cn.ysk.cashier.cons.service.dto.TbProskuConDto;
|
||||||
import cn.ysk.cashier.cons.service.dto.TbProskuConQueryCriteria;
|
import cn.ysk.cashier.cons.service.dto.TbProskuConQueryCriteria;
|
||||||
import cn.ysk.cashier.cons.service.mapstruct.TbProskuConMapper;
|
import cn.ysk.cashier.cons.service.mapstruct.TbProskuConMapper;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
import org.springframework.data.domain.Page;
|
import org.springframework.data.domain.Page;
|
||||||
@@ -39,6 +37,7 @@ import javax.servlet.http.HttpServletResponse;
|
|||||||
**/
|
**/
|
||||||
@Service
|
@Service
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
|
@Slf4j
|
||||||
public class TbProskuConServiceImpl implements TbProskuConService {
|
public class TbProskuConServiceImpl implements TbProskuConService {
|
||||||
|
|
||||||
private final TbProskuConRepository tbProskuConRepository;
|
private final TbProskuConRepository tbProskuConRepository;
|
||||||
@@ -81,7 +80,9 @@ public class TbProskuConServiceImpl implements TbProskuConService {
|
|||||||
if(product.getIsDistribute().intValue()==1){
|
if(product.getIsDistribute().intValue()==1){
|
||||||
|
|
||||||
TbConsInfo tbConsInfo= tbConsInfoRepository.findById(resource.getConsInfoId()).orElseGet(TbConsInfo::new);
|
TbConsInfo tbConsInfo= tbConsInfoRepository.findById(resource.getConsInfoId()).orElseGet(TbConsInfo::new);
|
||||||
if(ObjectUtil.isNull(tbConsInfo)){
|
|
||||||
|
log.info("product.getIsDistribute().intValue():{}", JSONUtil.toJSONString(tbConsInfo));
|
||||||
|
if(ObjectUtil.isNull(tbConsInfo)||ObjectUtil.isNull(tbConsInfo.getId())){
|
||||||
throw new BadRequestException("对应的耗材信息不存在");
|
throw new BadRequestException("对应的耗材信息不存在");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -94,7 +95,7 @@ public class TbProskuConServiceImpl implements TbProskuConService {
|
|||||||
TbProskuCon tbProskuCon=new TbProskuCon();
|
TbProskuCon tbProskuCon=new TbProskuCon();
|
||||||
|
|
||||||
tbProskuCon.setShopId(Integer.valueOf(tbProductSku.getShopId()));
|
tbProskuCon.setShopId(Integer.valueOf(tbProductSku.getShopId()));
|
||||||
tbProskuCon.setConInfoId(resource.getConsInfoId());
|
tbProskuCon.setConInfoId(tbConsInfo.getId());
|
||||||
tbProskuCon.setProductId(Integer.valueOf(tbProductSku.getProductId()));
|
tbProskuCon.setProductId(Integer.valueOf(tbProductSku.getProductId()));
|
||||||
tbProskuCon.setProductSkuId(tbProductSku.getId());
|
tbProskuCon.setProductSkuId(tbProductSku.getId());
|
||||||
tbProskuCon.setSurplusStock(resource.getSurplusStock());
|
tbProskuCon.setSurplusStock(resource.getSurplusStock());
|
||||||
@@ -112,16 +113,28 @@ public class TbProskuConServiceImpl implements TbProskuConService {
|
|||||||
|
|
||||||
|
|
||||||
TbConsInfo tbConsInfo= tbConsInfoRepository.findById(skuInfo.getConInfoId()).orElseGet(TbConsInfo::new);
|
TbConsInfo tbConsInfo= tbConsInfoRepository.findById(skuInfo.getConInfoId()).orElseGet(TbConsInfo::new);
|
||||||
if(ObjectUtil.isNull(tbConsInfo)){
|
|
||||||
|
log.info("skuInfo:{}", JSONUtil.toJSONString(tbConsInfo));
|
||||||
|
|
||||||
|
if(ObjectUtil.isNull(tbConsInfo)||ObjectUtil.isNull(tbConsInfo.getId())){
|
||||||
throw new BadRequestException("对应的耗材信息不存在");
|
throw new BadRequestException("对应的耗材信息不存在");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
TbProductSku tbProductSku= tbProductSkuRepository.findById(skuInfo.getSkuId()).orElseGet(TbProductSku::new);
|
||||||
|
if(ObjectUtil.isNull(tbProductSku)||ObjectUtil.isNull(tbProductSku.getId())){
|
||||||
|
throw new BadRequestException("规格信息不存在");
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
int count=tbProskuConRepository.countByConInfoIdAndProductSkuIdAndShopId(resource.getConsInfoId(), skuInfo.getSkuId(), skuInfo.getShopId(), resource.getProductId());
|
int count=tbProskuConRepository.countByConInfoIdAndProductSkuIdAndShopId(resource.getConsInfoId(), skuInfo.getSkuId(), skuInfo.getShopId(), resource.getProductId());
|
||||||
if(count<=0){
|
if(count<=0){
|
||||||
TbProskuCon tbProskuCon=new TbProskuCon();
|
TbProskuCon tbProskuCon=new TbProskuCon();
|
||||||
tbProskuCon.setShopId(Integer.valueOf(skuInfo.getShopId()));
|
tbProskuCon.setShopId(Integer.valueOf(skuInfo.getShopId()));
|
||||||
tbProskuCon.setConInfoId(skuInfo.getConInfoId());
|
tbProskuCon.setConInfoId(tbConsInfo.getId());
|
||||||
tbProskuCon.setProductId(resource.getProductId());
|
tbProskuCon.setProductId(resource.getProductId());
|
||||||
tbProskuCon.setProductSkuId(skuInfo.getSkuId());
|
tbProskuCon.setProductSkuId(skuInfo.getSkuId());
|
||||||
tbProskuCon.setSurplusStock(skuInfo.getSurplusStock());
|
tbProskuCon.setSurplusStock(skuInfo.getSurplusStock());
|
||||||
|
|||||||
Reference in New Issue
Block a user