From 90501ccfb125a61692dac45a9c276d32890e166d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A9=E9=B9=8F=E8=BE=89?= <18322780655@163.com>
Date: Wed, 10 Jul 2024 17:40:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=89=8D=E7=AB=AF=E4=BC=A0?=
 =?UTF-8?q?=E9=80=92=E6=95=B0=E6=8D=AE=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/TbProskuConServiceImpl.java  | 29 ++++++++++++++-----
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbProskuConServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbProskuConServiceImpl.java
index c38d53b4..114a1e7a 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbProskuConServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbProskuConServiceImpl.java
@@ -11,16 +11,14 @@ import cn.ysk.cashier.pojo.product.TbProduct;
 import cn.ysk.cashier.pojo.product.TbProductSku;
 import cn.ysk.cashier.repository.product.TbProductRepository;
 import cn.ysk.cashier.repository.product.TbProductSkuRepository;
-import cn.ysk.cashier.utils.FileUtil;
-import cn.ysk.cashier.utils.PageUtil;
-import cn.ysk.cashier.utils.QueryHelp;
-import cn.ysk.cashier.utils.ValidationUtil;
+import cn.ysk.cashier.utils.*;
 import lombok.RequiredArgsConstructor;
 import cn.ysk.cashier.cons.repository.TbProskuConRepository;
 import cn.ysk.cashier.cons.service.TbProskuConService;
 import cn.ysk.cashier.cons.service.dto.TbProskuConDto;
 import cn.ysk.cashier.cons.service.dto.TbProskuConQueryCriteria;
 import cn.ysk.cashier.cons.service.mapstruct.TbProskuConMapper;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.data.domain.Page;
@@ -39,6 +37,7 @@ import javax.servlet.http.HttpServletResponse;
 **/
 @Service
 @RequiredArgsConstructor
+@Slf4j
 public class TbProskuConServiceImpl implements TbProskuConService {
 
     private final TbProskuConRepository tbProskuConRepository;
@@ -81,7 +80,9 @@ public class TbProskuConServiceImpl implements TbProskuConService {
             if(product.getIsDistribute().intValue()==1){
 
                 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("对应的耗材信息不存在");
                 }
 
@@ -94,7 +95,7 @@ public class TbProskuConServiceImpl implements TbProskuConService {
                             TbProskuCon tbProskuCon=new TbProskuCon();
 
                             tbProskuCon.setShopId(Integer.valueOf(tbProductSku.getShopId()));
-                            tbProskuCon.setConInfoId(resource.getConsInfoId());
+                            tbProskuCon.setConInfoId(tbConsInfo.getId());
                             tbProskuCon.setProductId(Integer.valueOf(tbProductSku.getProductId()));
                             tbProskuCon.setProductSkuId(tbProductSku.getId());
                             tbProskuCon.setSurplusStock(resource.getSurplusStock());
@@ -112,16 +113,28 @@ public class TbProskuConServiceImpl implements TbProskuConService {
 
 
                     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("对应的耗材信息不存在");
                     }
 
 
+
+                    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());
                     if(count<=0){
                         TbProskuCon tbProskuCon=new TbProskuCon();
                         tbProskuCon.setShopId(Integer.valueOf(skuInfo.getShopId()));
-                        tbProskuCon.setConInfoId(skuInfo.getConInfoId());
+                        tbProskuCon.setConInfoId(tbConsInfo.getId());
                         tbProskuCon.setProductId(resource.getProductId());
                         tbProskuCon.setProductSkuId(skuInfo.getSkuId());
                         tbProskuCon.setSurplusStock(skuInfo.getSurplusStock());