From 114460f91550ad2b1c8d8b84d9fde203873f5d16 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Mon, 8 Jul 2024 09:20:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=95=86=E5=93=81=20?=
 =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E5=8F=AF=E4=B8=BA0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                         |  3 ++-
 .../impl/productimpl/TbProductServiceImpl.java     | 14 +++++++-------
 .../TbShopPurveyorTransactServiceImpl.java         | 13 +------------
 eladmin-system/src/main/resources/logback.xml      |  4 ++--
 4 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9acb04ae..28fb35fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,5 @@
 */target/*
 */*.iml
 /.gradle/
-/application.pid
\ No newline at end of file
+/application.pid
+*.log
\ No newline at end of file
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java
index 677c0db5..1f5c4dc5 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java
@@ -332,13 +332,13 @@ public class TbProductServiceImpl implements TbProductService {
             if (resources.getCategoryId() == null) {
                 throw new BadRequestException("必填内容未填写");
             }
-            if (resources.getIsShowMall() == 1) {
-                for (TbProductSku sku : resources.getSkuList()) {
-                    if (sku.getStockNumber() <= 0) {
-                        throw new BadRequestException("上架区域包括小程序时,库存数量必须大于0。");
-                    }
-                }
-            }
+//            if (resources.getIsShowMall() == 1) {
+//                for (TbProductSku sku : resources.getSkuList()) {
+//                    if (sku.getStockNumber() <= 0) {
+//                        throw new BadRequestException("上架区域包括小程序时,库存数量必须大于0。");
+//                    }
+//                }
+//            }
             product.setCategoryId(String.valueOf(resources.getCategoryId()));
         }
         if (!CollectionUtils.isEmpty(resources.getImages())) {
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopPurveyorTransactServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopPurveyorTransactServiceImpl.java
index 75cce193..b9cb0253 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopPurveyorTransactServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopPurveyorTransactServiceImpl.java
@@ -112,19 +112,8 @@ public class TbShopPurveyorTransactServiceImpl implements TbShopPurveyorTransact
         ValidationUtil.isNull(tbShopPurveyorTransact.getId(), "TbShopPurveyorTransact", "id", resources.getId());
         tbShopPurveyorTransact.setPaidAmount(tbShopPurveyorTransact.getPaidAmount().add(resources.getPaidAmount()));
         tbShopPurveyorTransact.setWaitAmount(tbShopPurveyorTransact.getTotalAmount().subtract(tbShopPurveyorTransact.getPaidAmount()));
-//        if (resources.getPaidAmount().compareTo(BigDecimal.ZERO) == 0) {
-//            throw new BadRequestException("付款金额不能为 0");
-//        } else {
-//            if (tbShopPurveyorTransact.getWaitAmount().compareTo(BigDecimal.ZERO) > 0 && resources.getPaidAmount().compareTo(BigDecimal.ZERO) > 0) {//待付款金额大于0
-//                tbShopPurveyorTransact.setWaitAmount(tbShopPurveyorTransact.getWaitAmount().subtract(resources.getPaidAmount()));
-//            } else if (tbShopPurveyorTransact.getWaitAmount().compareTo(BigDecimal.ZERO) < 0 && resources.getPaidAmount().compareTo(BigDecimal.ZERO) < 0) {
-//                tbShopPurveyorTransact.setWaitAmount(tbShopPurveyorTransact.getWaitAmount().subtract(resources.getPaidAmount()));
-//            } else {
-//                tbShopPurveyorTransact.setWaitAmount(tbShopPurveyorTransact.getWaitAmount().add(resources.getPaidAmount()));
-//            }
-//        }
         tbShopPurveyorTransact.setPaidAt(System.currentTimeMillis());
-        if (tbShopPurveyorTransact.getWaitAmount().compareTo(tbShopPurveyorTransact.getPaidAmount()) <= 0) {
+        if (tbShopPurveyorTransact.getPaidAmount().compareTo(tbShopPurveyorTransact.getTotalAmount()) >= 0) {
             tbShopPurveyorTransact.setStatus(1);
         }else {
             tbShopPurveyorTransact.setStatus(0);
diff --git a/eladmin-system/src/main/resources/logback.xml b/eladmin-system/src/main/resources/logback.xml
index c959995d..ddd11093 100644
--- a/eladmin-system/src/main/resources/logback.xml
+++ b/eladmin-system/src/main/resources/logback.xml
@@ -38,8 +38,8 @@
     <logger name="jdbc.sqlonly" level="ERROR" additivity="false">
         <appender-ref ref="console" />
     </logger>
-    <logger name="org.hibernate.SQL" level="DEBUG" >
-<!--        <appender-ref ref="console" />-->
+    <logger name="org.hibernate.SQL" level="debug">
+
     </logger>
 
     <logger name="jdbc.resultset" level="ERROR" additivity="false">