diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/CheckOrderPay.java b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/CheckOrderPay.java index 6dc7d6d1..596d19e2 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/CheckOrderPay.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/CheckOrderPay.java @@ -88,6 +88,10 @@ public class CheckOrderPay implements Serializable { * 使用的积分数量 (扣除各类折扣 enable_deduction后使用) */ private Integer pointsNum; + /** + * 是否打票 + */ + private Integer isPrint; private String remark; @@ -96,6 +100,10 @@ public class CheckOrderPay implements Serializable { return seatNum == null ? 0 : seatNum; } + public Integer getIsPrint() { + return isPrint == null ? 1 : isPrint; + } + public Integer getPointsNum() { return pointsNum == null ? 0 : pointsNum; } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderInfo.java b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderInfo.java index 0a50427a..9e149dfd 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderInfo.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderInfo.java @@ -245,6 +245,10 @@ public class OrderInfo implements Serializable { * 是否使用了霸王餐 */ private Integer isFreeDine; + /** + * 是否打票 + */ + private Integer isPrint; /** * 是否等叫 0 否 1 等叫 diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java index f4cb2636..55328a78 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java @@ -724,7 +724,7 @@ public class OrderInfoServiceImpl extends ServiceImpl vipPayOrder(OrderPayParamDTO payParam) { ShopInfo shopInfo = shopInfoService.getById(payParam.getShopId()); AssertUtil.isNull(shopInfo, "店铺不存在"); - if(!shopInfo.getIsAccountPay().equals(1)){ + if (!shopInfo.getIsAccountPay().equals(1)) { return CzgResult.failure("支付失败,店铺暂未开启会员余额支付。"); } ShopUser shopUser = new ShopUser();