diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/UpdateCartDTO.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/UpdateCartDTO.java index 4176189a..db07564f 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/UpdateCartDTO.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/UpdateCartDTO.java @@ -20,7 +20,7 @@ public class UpdateCartDTO { @Min(0) private Integer num; private String note; - private boolean isPack; - private boolean isGift; + private Boolean isPack; + private Boolean isGift; } 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 b2b98366..45ebcc5b 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 @@ -372,19 +372,21 @@ public class TbShopTableServiceImpl implements TbShopTableService { tbCashierCart.setTotalAmount(new BigDecimal(updateCartDTO.getNum()).multiply(productSku.getSalePrice())); tbCashierCart.setNote(updateCartDTO.getNote()); - if (!updateCartDTO.isPack()) { - tbCashierCart.setPackFee(BigDecimal.ZERO); - } else { - tbCashierCart.setPackFee(new BigDecimal(updateCartDTO.getNum()).multiply(product.getPackFee())); - tbCashierCart.setTotalAmount(tbCashierCart.getTotalAmount().add(tbCashierCart.getPackFee())); + if (updateCartDTO.getIsPack() != null) { + if (!updateCartDTO.getIsPack()) { + tbCashierCart.setPackFee(BigDecimal.ZERO); + } else { + tbCashierCart.setPackFee(new BigDecimal(updateCartDTO.getNum()).multiply(product.getPackFee())); + tbCashierCart.setTotalAmount(tbCashierCart.getTotalAmount().add(tbCashierCart.getPackFee())); + } + tbCashierCart.setIsPack(updateCartDTO.getIsPack() ? "true" : "false"); } - if (updateCartDTO.isGift()) { + if (updateCartDTO.getIsGift() != null && updateCartDTO.getIsGift()) { tbCashierCart.setTotalAmount(BigDecimal.ZERO); + tbCashierCart.setIsGift(updateCartDTO.getIsGift() ? "true" : "false"); } - tbCashierCart.setIsPack(updateCartDTO.isPack() ? "true" : "false"); - tbCashierCart.setIsGift(updateCartDTO.isGift() ? "true" : "false"); tbCashierCart.setTotalNumber(updateCartDTO.getNum()); tbCashierCart.setNumber(updateCartDTO.getNum()); tbCashierCart.setCategoryId(product.getCategoryId());