From 7f3b924212f4ab644b92b973f2f2dc334c4b39f1 Mon Sep 17 00:00:00 2001 From: tianfeng <769204422@qq.com> Date: Tue, 2 Dec 2025 15:29:26 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=E8=AE=A2=E5=8D=95=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E6=9B=B4=E6=94=B9"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 8361fde309e995f84c5a7b14116161675fbe2175. --- .../circle/order/inner/model/enums/MonthlyRechargeType.java | 4 ---- .../order/infra/gateway/UserRechargeCountGatewayImpl.java | 4 +--- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/rc-service/rc-inner-api/order-inner/order-inner-model/src/main/java/com/red/circle/order/inner/model/enums/MonthlyRechargeType.java b/rc-service/rc-inner-api/order-inner/order-inner-model/src/main/java/com/red/circle/order/inner/model/enums/MonthlyRechargeType.java index 6439a704..59e2d433 100644 --- a/rc-service/rc-inner-api/order-inner/order-inner-model/src/main/java/com/red/circle/order/inner/model/enums/MonthlyRechargeType.java +++ b/rc-service/rc-inner-api/order-inner/order-inner-model/src/main/java/com/red/circle/order/inner/model/enums/MonthlyRechargeType.java @@ -78,8 +78,4 @@ public enum MonthlyRechargeType { PAY_PAL, CLIPSPAY, SELLER_AGENT); } - public static List notCountTypes() { - return List.of(SHIPPING_AGENT, SALARY_EXCHANGE, UNDEFINED); - } - } diff --git a/rc-service/rc-service-order/order-infrastructure/src/main/java/com/red/circle/order/infra/gateway/UserRechargeCountGatewayImpl.java b/rc-service/rc-service-order/order-infrastructure/src/main/java/com/red/circle/order/infra/gateway/UserRechargeCountGatewayImpl.java index 134f656e..6784306f 100644 --- a/rc-service/rc-service-order/order-infrastructure/src/main/java/com/red/circle/order/infra/gateway/UserRechargeCountGatewayImpl.java +++ b/rc-service/rc-service-order/order-infrastructure/src/main/java/com/red/circle/order/infra/gateway/UserRechargeCountGatewayImpl.java @@ -39,12 +39,10 @@ public class UserRechargeCountGatewayImpl implements UserRechargeCountGateway { @Override public void count(Long userId, BigDecimal amount, MonthlyRechargeType type) { userMonthlyRechargeService.incrThisMonthAmount(userId, amount, type); + totalRechargeService.incrAmount(userId, amount, type); monthlyRechargeUserService.incAmount(userId, amount); totalRechargeUserService.incAmount(userId, amount); - if (!MonthlyRechargeType.notCountTypes().contains(type)) { - totalRechargeService.incrAmount(userId, amount, type); - } } @Override