From 307ebac8fa83b5d10d515859599d2c31bdab73b4 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Tue, 23 Sep 2025 16:51:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=95=E5=85=A5=E5=8C=85=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/czg/config/RedisKeyExpirationListener.java | 4 ++-- .../main/java/com/czg/controller/OrderPayController.java | 6 +++--- .../service/market/service/impl/MemberOrderServiceImpl.java | 2 +- .../market/service/impl/TbMemberConfigServiceImpl.java | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cash-api/order-server/src/main/java/com/czg/config/RedisKeyExpirationListener.java b/cash-api/order-server/src/main/java/com/czg/config/RedisKeyExpirationListener.java index d824fdd2b..6a0d433bf 100644 --- a/cash-api/order-server/src/main/java/com/czg/config/RedisKeyExpirationListener.java +++ b/cash-api/order-server/src/main/java/com/czg/config/RedisKeyExpirationListener.java @@ -26,7 +26,7 @@ public class RedisKeyExpirationListener implements MessageListener { @Value("${spring.data.redis.database}") private String database; @Resource - private OrderInfoService tbOrderInfoService; + private OrderInfoService orderInfoService; @DubboReference private ShopTableService tableService; @@ -49,7 +49,7 @@ public class RedisKeyExpirationListener implements MessageListener { if (expiredKey.startsWith(RedisCst.classKeyExpired.EXPIRED_ORDER)) { log.info("监听到订单过期,订单Id: {}", expiredKey); String orderId = expiredKey.substring(RedisCst.classKeyExpired.EXPIRED_ORDER.length()); - tbOrderInfoService.expired(Long.parseLong(orderId)); + orderInfoService.expired(Long.parseLong(orderId)); }else if (expiredKey.startsWith(RedisCst.classKeyExpired.EXPIRED_TABLE)) { log.info("监听到台桌清台过期,台桌Id: {}", expiredKey); String tableId = expiredKey.substring(RedisCst.classKeyExpired.EXPIRED_TABLE.length()); diff --git a/cash-api/order-server/src/main/java/com/czg/controller/OrderPayController.java b/cash-api/order-server/src/main/java/com/czg/controller/OrderPayController.java index 3e839b33c..eca5cdc93 100644 --- a/cash-api/order-server/src/main/java/com/czg/controller/OrderPayController.java +++ b/cash-api/order-server/src/main/java/com/czg/controller/OrderPayController.java @@ -35,7 +35,7 @@ public class OrderPayController { @Resource private PayService payService; @Resource - private OrderInfoService orderService; + private OrderInfoService orderInfoService; @DubboReference private SysParamsService paramsService; @@ -141,7 +141,7 @@ public class OrderPayController { map.put("payAmount", checkOrderPay.getOrderAmount()); map.put("extend", StrUtil.isEmpty(extend) ? "" : extend); if (checkOrderPay.getOrderId() != null) { - OrderInfo orderInfo = orderService.checkOrderPay(checkOrderPay); + OrderInfo orderInfo = orderInfoService.checkOrderPay(checkOrderPay); map.put("payAmount", orderInfo.getOrderAmount()); } String baseUrl = paramsService.getSysParamValue(SysParamCodeEnum.SHOP_ORDER_PAY_BASE_URL.getCode()); @@ -168,7 +168,7 @@ public class OrderPayController { @GetMapping("/queryOrderStatus") public CzgResult queryOrderStatus(Long orderId) { CzgResult result = CzgResult.success(); - String status = orderService.queryChain().select(OrderInfo::getStatus).eq(OrderInfo::getId, orderId).oneAs(String.class); + String status = orderInfoService.queryChain().select(OrderInfo::getStatus).eq(OrderInfo::getId, orderId).oneAs(String.class); result.setData(status); switch (status) { case "unpaid" -> result.setMsg("等待用户付款"); diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MemberOrderServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MemberOrderServiceImpl.java index da369b89e..0a02367de 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MemberOrderServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MemberOrderServiceImpl.java @@ -51,7 +51,7 @@ public class MemberOrderServiceImpl extends ServiceImpl 0; case "RECHARGE_AMOUNT" -> - orderPaymentService.list(new QueryWrapper().eq(OrderPayment::getShopId, shopUser.getSourceShopId()) + paymentService.list(new QueryWrapper().eq(OrderPayment::getShopId, shopUser.getSourceShopId()) .eq(OrderPayment::getSourceId, shopUser.getId()).isNotNull(OrderPayment::getTradeNumber)) .stream().map(OrderPayment::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add).compareTo(new BigDecimal(item.getValue())) > 0; default -> throw new CzgException("会员开通条件类型错误");