From 2fa2ea6ea3e80e2cde8d044c8460bbeb2b66cb5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Sat, 27 Sep 2025 21:01:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=94=AF=E4=BB=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/order/service/impl/OrderInfoServiceImpl.java    | 2 +-
 .../com/czg/service/order/service/impl/PayServiceImpl.java  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

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<OrderInfoMapper, OrderInfo
             couponRecordMap.forEach((type, record) -> {
                 //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, "支付失败 该店铺用户不存在");