czg_team
/
cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
韩鹏辉 2024-07-08 10:27:08 +08:00
parent 9ce0db167e 114460f915
commit 259705cb76
4 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -4,4 +4,5 @@
*/target/* */target/*
*/*.iml */*.iml
/.gradle/ /.gradle/
/application.pid /application.pid
*.log

14
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java
View File

@ -332,13 +332,13 @@ public class TbProductServiceImpl implements TbProductService {
if (resources.getCategoryId() == null) { if (resources.getCategoryId() == null) {
throw new BadRequestException("必填内容未填写"); throw new BadRequestException("必填内容未填写");
} }
if (resources.getIsShowMall() == 1) { // if (resources.getIsShowMall() == 1) {
for (TbProductSku sku : resources.getSkuList()) { // for (TbProductSku sku : resources.getSkuList()) {
if (sku.getStockNumber() <= 0) { // if (sku.getStockNumber() <= 0) {
throw new BadRequestException("上架区域包括小程序时,库存数量必须大于0。"); // throw new BadRequestException("上架区域包括小程序时,库存数量必须大于0。");
} // }
} // }
} // }
product.setCategoryId(String.valueOf(resources.getCategoryId())); product.setCategoryId(String.valueOf(resources.getCategoryId()));
} }
if (!CollectionUtils.isEmpty(resources.getImages())) { if (!CollectionUtils.isEmpty(resources.getImages())) {

13
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopPurveyorTransactServiceImpl.java
View File

@ -112,19 +112,8 @@ public class TbShopPurveyorTransactServiceImpl implements TbShopPurveyorTransact
ValidationUtil.isNull(tbShopPurveyorTransact.getId(), "TbShopPurveyorTransact", "id", resources.getId()); ValidationUtil.isNull(tbShopPurveyorTransact.getId(), "TbShopPurveyorTransact", "id", resources.getId());
tbShopPurveyorTransact.setPaidAmount(tbShopPurveyorTransact.getPaidAmount().add(resources.getPaidAmount())); tbShopPurveyorTransact.setPaidAmount(tbShopPurveyorTransact.getPaidAmount().add(resources.getPaidAmount()));
tbShopPurveyorTransact.setWaitAmount(tbShopPurveyorTransact.getTotalAmount().subtract(tbShopPurveyorTransact.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()); tbShopPurveyorTransact.setPaidAt(System.currentTimeMillis());
if (tbShopPurveyorTransact.getWaitAmount().compareTo(tbShopPurveyorTransact.getPaidAmount()) <= 0) { if (tbShopPurveyorTransact.getPaidAmount().compareTo(tbShopPurveyorTransact.getTotalAmount()) >= 0) {
tbShopPurveyorTransact.setStatus(1); tbShopPurveyorTransact.setStatus(1);
}else { }else {
tbShopPurveyorTransact.setStatus(0); tbShopPurveyorTransact.setStatus(0);

4
eladmin-system/src/main/resources/logback.xml
View File

@ -38,8 +38,8 @@
<logger name="jdbc.sqlonly" level="ERROR" additivity="false"> <logger name="jdbc.sqlonly" level="ERROR" additivity="false">
<appender-ref ref="console" /> <appender-ref ref="console" />
</logger> </logger>
<logger name="org.hibernate.SQL" level="DEBUG" > <logger name="org.hibernate.SQL" level="debug">
<!-- <appender-ref ref="console" />-->
</logger> </logger>
<logger name="jdbc.resultset" level="ERROR" additivity="false"> <logger name="jdbc.resultset" level="ERROR" additivity="false">