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 f7d52da7..ac60c206 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 @@ -389,7 +389,7 @@ public class OrderInfoServiceImpl extends ServiceImpl { //1-满减券,2-商品兑换券,3-折扣券,4-第二件半价券, 6-买一送一券, // 7-固定价格券,8-免配送费券 暂时没有 - if (type == 2) {//商品券 + if (type == 2) {//商品券z ShopCoupon coupon = checkCoupon(record, param.isVipPrice()); if (coupon.getOtherCouponShare() != 1) { otherCouponShare.set(false); diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java index 5d62352c..24d416c2 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java @@ -259,9 +259,9 @@ public class PayServiceImpl implements PayService { OrderInfo orderInfo = checkPay(payParam.getCheckOrderPay()); ShopInfo shopInfo = shopInfoService.getById(payParam.getShopId()); AssertUtil.isNull(shopInfo, "店铺不存在"); - if (!shopInfo.getIsAccountPay().equals(1)) { - return CzgResult.failure("支付失败,店铺暂未开启会员余额支付。"); - } +// if (!shopInfo.getIsAccountPay().equals(1)) { +// return CzgResult.failure("支付失败,店铺暂未开启会员余额支付。"); +// } AssertUtil.isNull(payParam.getShopUserId(), "请选择付款人后重试"); ShopUser shopUser = shopUserService.getById(payParam.getShopUserId()); AssertUtil.isNull(shopUser, "支付失败 该店铺用户不存在");