diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbCashierCart.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbCashierCart.java index 8e79075f..4915beac 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbCashierCart.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbCashierCart.java @@ -165,7 +165,7 @@ public class TbCashierCart implements Serializable { private String platformType; // 优惠券id private Integer userCouponId; - private BigDecimal memberPrice; + private BigDecimal memberPrice = BigDecimal.ZERO; private Integer isMember; public void copy(TbCashierCart source){ 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 041951f9..a5f6fc2f 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 @@ -1344,14 +1344,9 @@ public class TbShopTableServiceImpl implements TbShopTableService { if (TableConstant.CashierCart.Status.CREATE.equalsVals(tbCashierCart.getStatus())) { cartInfoDTO.setNewAddTotalAmount(cartInfoDTO.getNewAddTotalAmount().add(tbCashierCart.getTotalAmount())); } + tbCashierCart.setIsMember(tbCashierCart.getMemberPrice() == null && shopUser != null && shopUser.getIsVip() == 1 ? 0 : 1); tbCashierCart.resetTotalAmount(); - if (shopUser != null) { - if (shopUser.getIsVip() == 0) { - tbCashierCart.setIsMember(0); - }else { - tbCashierCart.setIsMember(tbCashierCart.getMemberPrice() == null ? 0 : 1); - } - } + cartInfoDTO.setTotalAmount(cartInfoDTO.getTotalAmount().add(tbCashierCart.getTotalAmount())); } cartInfoDTO.setCashierCartIds(cartIdList);