diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java index 5b47f00d..7709c929 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java @@ -1705,7 +1705,7 @@ public class TbShopTableServiceImpl implements TbShopTableService { orderDetail.setIsMember(cashierCart.getIsMember()); orderDetail.setIsPrint(cashierCart.getIsPrint()); orderDetail.setUseCouponInfo(cashierCart.getUseCouponInfo()); - + orderDetail.setCanReturnAmount(orderDetail.getPriceAmount()); priceDTO.getOrderDetailList().add(orderDetail); } return priceDTO; @@ -2295,6 +2295,7 @@ public class TbShopTableServiceImpl implements TbShopTableService { detailList.forEach(item -> { 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.setMemberPrice(item.getMemberPrice().multiply(discount).setScale(2, RoundingMode.HALF_UP)); });