sku等一些覆盖问题
This commit is contained in:
@@ -44,6 +44,7 @@ import org.springframework.data.domain.Pageable;
|
||||
import org.springframework.data.domain.Sort;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.util.CollectionUtils;
|
||||
import org.springframework.util.StringUtils;
|
||||
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
@@ -119,7 +120,7 @@ public class TbProductServiceImpl implements TbProductService {
|
||||
//sku
|
||||
if (sku.getProductId().equals(product.getId().toString())) {
|
||||
skuList.add(sku);
|
||||
realSalesNumber = realSalesNumber + sku.getRealSalesNumber();
|
||||
realSalesNumber = realSalesNumber + (sku.getRealSalesNumber()==null?0:sku.getRealSalesNumber());
|
||||
stockNumber = stockNumber + sku.getStockNumber();
|
||||
}
|
||||
}
|
||||
@@ -185,9 +186,9 @@ public class TbProductServiceImpl implements TbProductService {
|
||||
tbProductVo.setGroupSnap(ListUtil.stringChangeList(tbProduct.getGroupSnap()));
|
||||
}
|
||||
BeanUtils.copyProperties(tbProduct, tbProductVo);
|
||||
tbProductVo.setImages(ListUtil.stringChangeStringList(tbProduct.getImages()));
|
||||
|
||||
|
||||
if(!org.apache.commons.lang3.StringUtils.isBlank(tbProduct.getImages())){
|
||||
tbProductVo.setImages(ListUtil.stringChangeStringList(tbProduct.getImages()));
|
||||
}
|
||||
HashMap<String, String> map = new HashMap<>();
|
||||
//商品规格
|
||||
if (tbProductSpec.get() == null) {
|
||||
@@ -245,7 +246,9 @@ public class TbProductServiceImpl implements TbProductService {
|
||||
}
|
||||
}
|
||||
}
|
||||
product.setImages(resources.getImages().toString());
|
||||
if(!CollectionUtils.isEmpty(resources.getImages())){
|
||||
product.setImages(resources.getImages().toString());
|
||||
}
|
||||
product.setCategoryId(String.valueOf(resources.getCategoryId()));
|
||||
product.setIsDel(0);
|
||||
product.setIsDelete(0);
|
||||
|
||||
@@ -24,6 +24,7 @@ import lombok.RequiredArgsConstructor;
|
||||
import cn.ysk.cashier.repository.product.TbProductSkuRepository;
|
||||
import cn.ysk.cashier.service.product.TbProductSkuService;
|
||||
import cn.ysk.cashier.dto.product.TbProductSkuDto;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.data.domain.Page;
|
||||
@@ -43,6 +44,7 @@ import java.util.LinkedHashMap;
|
||||
* @author lyf
|
||||
* @date 2024-01-03
|
||||
**/
|
||||
@Slf4j
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class TbProductSkuServiceImpl implements TbProductSkuService {
|
||||
@@ -80,7 +82,9 @@ public class TbProductSkuServiceImpl implements TbProductSkuService {
|
||||
public void update(TbProductSku resources) {
|
||||
TbProductSku tbProductSku = tbProductSkuRepository.findById(resources.getId()).orElseGet(TbProductSku::new);
|
||||
ValidationUtil.isNull( tbProductSku.getId(),"TbProductSku","id",resources.getId());
|
||||
log.info("入库前{}",tbProductSku);
|
||||
tbProductSku.copy(resources);
|
||||
log.info("入库后{}",tbProductSku);
|
||||
tbProductSkuRepository.save(tbProductSku);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user