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 @@
-
-
+
+