From ba06410d44b68b7a1534ea7a4d317d52df945e16 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Fri, 27 Sep 2024 14:17:15 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=BF=AB=E6=8D=B7=E6=8E=A5=E5=8F=A3=20?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashier/repository/product/TbProductSkuRepository.java    | 4 ++--
 .../cashier/service/impl/productimpl/StockServiceImpl.java    | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbProductSkuRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbProductSkuRepository.java
index 216d729c..c10173db 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbProductSkuRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbProductSkuRepository.java
@@ -207,6 +207,6 @@ public interface TbProductSkuRepository extends JpaRepository<TbProductSku, Inte
     void updateGrounding(Integer skuId,int isGrounding);
 
     @Modifying
-    @Query("update TbProductSku set salePrice = :salePrice where productId=:productId")
-    void upSalePrice(@Param("productId") Integer productId, @Param("lowPrice") BigDecimal salePrice);
+    @Query("update TbProductSku set salePrice = :salePrice where productId= :productId")
+    void upSalePrice(@Param("productId") String productId, @Param("lowPrice") BigDecimal salePrice);
 }
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/StockServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/StockServiceImpl.java
index bac4327d..19410615 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/StockServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/StockServiceImpl.java
@@ -414,13 +414,14 @@ public class StockServiceImpl implements StockService {
                     detail.setType("盘点入库");
                 }
                 detail.setCreatedAt(System.currentTimeMillis());
+                detail.setUpdatedAt(System.currentTimeMillis());
                 tbProductStockDetailRepository.save(detail);
                 break;
             case "salePrice"://价格
                 description.append("修改价格为" + updateValueVO.getValue());
                 sqlQuery.append(" set low_price = ").append(updateValueVO.getValue());
                 tbProductRepository.upLowPrice(product.getId(),new BigDecimal(updateValueVO.getValue()));
-                tbProductSkuRepository.upSalePrice(product.getId(),new BigDecimal(updateValueVO.getValue()));
+                tbProductSkuRepository.upSalePrice(product.getId().toString(),new BigDecimal(updateValueVO.getValue()));
                 break;
             case "refundStock"://商品 暂停销售
                 if (!"0".equals(updateValueVO.getValue()) && !"1".equals(updateValueVO.getValue())) {

From 74fee9a48ea9c3f60d0c00b38794625fb85e6192 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Fri, 27 Sep 2024 14:31:16 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=80=97=E6=9D=90=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E7=BB=91=E5=AE=9A=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cons/rest/TbProskuConController.java      |  2 +-
 .../service/impl/TbProskuConServiceImpl.java  | 22 ++++++++++++++++---
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbProskuConController.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbProskuConController.java
index 7017a82f..740a8b3c 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbProskuConController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbProskuConController.java
@@ -69,7 +69,7 @@ public class TbProskuConController {
             throw new Exception(be.getMessage());
         }catch (Exception e){
             e.printStackTrace();
-            throw new Exception("参数错误");
+            throw new Exception(e.getMessage());
         }
     }
 
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 428d6c0c..9720bbe8 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
@@ -196,15 +196,31 @@ public class TbProskuConServiceImpl implements TbProskuConService {
             if (ObjectUtil.isNull(tbConsInfo) || ObjectUtil.isNull(tbConsInfo.getId())) {
                 throw new BadRequestException("对应的耗材信息不存在");
             }
+            TbProductSku sku = null;
             if (resource.getProductSkuId() != 0) {
-                TbProductSku sku  = tbProductSkuRepository.findById(resource.getProductSkuId()).orElseGet(TbProductSku::new);
+                sku  = tbProductSkuRepository.findById(resource.getProductSkuId()).orElseGet(TbProductSku::new);
                 if (ObjectUtil.isNull(sku) || ObjectUtil.isNull(sku.getId())) {
                     throw new BadRequestException("规格信息不存在");
                 }
             }
             TbProskuCon tbConsInfo1 = new TbProskuCon();
-            BeanUtil.copyProperties(resource,tbConsInfo1, CopyOptions.create().setIgnoreNullValue(true));
-            newCons.add(tbConsInfo1);
+            if (resource.getId() == null) {
+                int count = tbProskuConRepository.countByConInfoIdAndProductSkuIdAndShopId(resource.getConInfoId(), resource.getProductSkuId(), resource.getShopId(), resource.getProductId());
+                if (count <= 0) {
+                    BeanUtil.copyProperties(resource, tbConsInfo1, CopyOptions.create().setIgnoreNullValue(true));
+                    newCons.add(tbConsInfo1);
+                } else {
+                    StringBuilder strResult = new StringBuilder(product.getName());
+                    if (sku != null) {
+                        strResult.append(" 规格" + sku.getSpecSnap());
+                    }
+                    strResult.append("与耗材 " + tbConsInfo.getConName() + " 的对应关系已存在");
+                    throw new BadRequestException(product.getName().concat("对应的").concat(Objects.nonNull(sku.getSpecSnap())?sku.getSpecSnap():"").concat("规格已存在"));
+                }
+            }else {
+                BeanUtil.copyProperties(resource,tbConsInfo1, CopyOptions.create().setIgnoreNullValue(true));
+                newCons.add(tbConsInfo1);
+            }
         }
         if (!CollectionUtils.isEmpty(newCons)) {
             tbProskuConRepository.saveAll(newCons);