diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java index b27dfb3a..5db9d6a2 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java @@ -316,6 +316,9 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService { case "deposit": dto.setPayType("储值卡支付"); break; + case "creditBuyer": + dto.setPayType("挂账支付"); + break; default: dto.setPayType(tbOrderInfo.getSendType()); break; 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 a95e8954..2cd7bec8 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 @@ -464,8 +464,12 @@ public class TbShopTableServiceImpl implements TbShopTableService { tbCashierCart.setSalePrice(tbCashierCart.getSalePrice()); tbCashierCart.setTotalAmount(updateCartDTO.getNum().multiply(tbCashierCart.getSalePrice())); tbCashierCart.setNote(updateCartDTO.getNote()); - tbCashierCart.setIsPrint(updateCartDTO.getIsPrint()); - tbCashierCart.setIsWaitCall(updateCartDTO.getIsWaitCall()); + if (updateCartDTO.getIsPrint() != null) { + tbCashierCart.setIsPrint(updateCartDTO.getIsPrint()); + } + if (updateCartDTO.getIsWaitCall() != null) { + tbCashierCart.setIsWaitCall(updateCartDTO.getIsWaitCall()); + } if (updateCartDTO.getIsPack() != null) { if (!updateCartDTO.getIsPack()) {