From 0b5ec53187112eb877a569f5b44b5148f9f680a5 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Thu, 25 Dec 2025 15:46:09 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A9=BA=E5=80=BC=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../market/service/impl/TbMemberConfigServiceImpl.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java
index b51da74e1..b2696b816 100644
--- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java
+++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java
@@ -127,13 +127,13 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
 
                         break;
                     case "COST_AMOUNT":
-                        conditionMap.put("COST_AMOUNT", orderInfoService.getOneAs(query().select("sum(pay_amount)").eq(OrderInfo::getShopId, shopId).eq(OrderInfo::getUserId, shopUserInfo.getUserId())
+                        conditionMap.put("COST_AMOUNT", orderInfoService.getOneAs(query().select("IFNULL(sum(pay_amount), 0) as total_amount ").eq(OrderInfo::getShopId, shopId).eq(OrderInfo::getUserId, shopUserInfo.getUserId())
                                         .notIn(OrderInfo::getStatus, OrderStatusEnums.UNPAID.getCode(), OrderStatusEnums.CANCELLED.getCode()), BigDecimal.class)
                                 .compareTo(new BigDecimal(item.getValue())) >= 0);
 
                         break;
                     case "RECHARGE_AMOUNT":
-                        conditionMap.put("RECHARGE_AMOUNT", paymentService.getOneAs(query().select("sum(amount)")
+                        conditionMap.put("RECHARGE_AMOUNT", paymentService.getOneAs(query().select("IFNULL(sum(amount), 0) as total_amount ")
                                         .eq(OrderPayment::getShopId, shopId)
                                         .eq(OrderPayment::getSourceType, PayTypeConstants.SourceType.MEMBER_IN)
                                         .eq(OrderPayment::getPayType, PayTypeConstants.PayType.PAY)
@@ -422,10 +422,10 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
                         orderInfoService.count(query().eq(OrderInfo::getShopId, shopId).eq(OrderInfo::getUserId, shopUser.getUserId())
                                 .eq(OrderInfo::getStatus, OrderStatusEnums.DONE.getCode())) >= Integer.parseInt(item.getValue());
                 case "COST_AMOUNT" ->
-                        orderInfoService.getOneAs(query().select("sum(pay_amount)").eq(OrderInfo::getShopId, shopId).eq(OrderInfo::getUserId, shopUser.getUserId())
+                        orderInfoService.getOneAs(query().select("IFNULL(sum(pay_amount), 0) as total_amount").eq(OrderInfo::getShopId, shopId).eq(OrderInfo::getUserId, shopUser.getUserId())
                                         .eq(OrderInfo::getStatus, OrderStatusEnums.DONE.getCode()), BigDecimal.class)
                                 .compareTo(new BigDecimal(item.getValue())) >= 0;
-                case "RECHARGE_AMOUNT" -> paymentService.getOneAs(query().select("sum(amount)")
+                case "RECHARGE_AMOUNT" -> paymentService.getOneAs(query().select("IFNULL(sum(amount), 0) as total_amount")
                                 .eq(OrderPayment::getShopId, shopId)
                                 .eq(OrderPayment::getSourceType, PayTypeConstants.SourceType.MEMBER_IN)
                                 .eq(OrderPayment::getPayType, PayTypeConstants.PayType.PAY)