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

fix: 未选择折扣可退款金额为null修复

Browse Source
This commit is contained in:
张松
2024-12-11 17:24:49 +08:00
parent 5fc070b75e
commit f42cc63245
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1705,7 +1705,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
orderDetail.setIsMember(cashierCart.getIsMember()); orderDetail.setIsMember(cashierCart.getIsMember());
orderDetail.setIsPrint(cashierCart.getIsPrint()); orderDetail.setIsPrint(cashierCart.getIsPrint());
orderDetail.setUseCouponInfo(cashierCart.getUseCouponInfo()); orderDetail.setUseCouponInfo(cashierCart.getUseCouponInfo());
orderDetail.setCanReturnAmount(orderDetail.getPriceAmount());
priceDTO.getOrderDetailList().add(orderDetail); priceDTO.getOrderDetailList().add(orderDetail);
} }
return priceDTO; return priceDTO;
@@ -2295,6 +2295,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
detailList.forEach(item -> { detailList.forEach(item -> {
item.setPriceAmount(item.getPriceAmount().multiply(discount).setScale(2, RoundingMode.HALF_EVEN)); item.setPriceAmount(item.getPriceAmount().multiply(discount).setScale(2, RoundingMode.HALF_EVEN));
item.setCanReturnAmount(item.getPriceAmount());
// item.setPrice(item.getPrice().multiply(discount).setScale(2, RoundingMode.HALF_UP)); // item.setPrice(item.getPrice().multiply(discount).setScale(2, RoundingMode.HALF_UP));
// item.setMemberPrice(item.getMemberPrice().multiply(discount).setScale(2, RoundingMode.HALF_UP)); // item.setMemberPrice(item.getMemberPrice().multiply(discount).setScale(2, RoundingMode.HALF_UP));
}); });