${maskedId}
仅剩 ${leftNum} 人成团
diff --git a/group-buying-sys-domain/src/main/java/edu/whut/domain/trade/service/lock/TradeLockLockOrderService.java b/group-buying-sys-domain/src/main/java/edu/whut/domain/trade/service/lock/TradeLockLockOrderService.java
index 6837ad9..d7e4732 100644
--- a/group-buying-sys-domain/src/main/java/edu/whut/domain/trade/service/lock/TradeLockLockOrderService.java
+++ b/group-buying-sys-domain/src/main/java/edu/whut/domain/trade/service/lock/TradeLockLockOrderService.java
@@ -38,7 +38,6 @@ public class TradeLockLockOrderService implements ITradeLockOrderService {
return repository.queryGroupBuyProgress(teamId);
}
- //TODO:设置超时未付款自动取消lock,释放资源
@Override
public MarketPayOrderEntity lockMarketPayOrder(UserEntity userEntity, PayActivityEntity payActivityEntity, PayDiscountEntity payDiscountEntity) throws Exception{
log.info("拼团交易-锁定营销优惠支付订单:{} activityId:{} goodsId:{}", userEntity.getUserId(), payActivityEntity.getActivityId(), payDiscountEntity.getGoodsId());
diff --git a/group-buying-sys-domain/src/main/java/edu/whut/domain/trade/service/task/TradeTaskService.java b/group-buying-sys-domain/src/main/java/edu/whut/domain/trade/service/task/TradeTaskService.java
index 40196ab..ca8e3cc 100644
--- a/group-buying-sys-domain/src/main/java/edu/whut/domain/trade/service/task/TradeTaskService.java
+++ b/group-buying-sys-domain/src/main/java/edu/whut/domain/trade/service/task/TradeTaskService.java
@@ -68,6 +68,7 @@ public class TradeTaskService implements ITradeTaskService {
* @return key——任务总量、successCount、errorCount、retryCount
*/
private Map execNotifyJob(List notifyTaskEntityList) throws Exception {
+ //successCount:成功回调的任务数量
int successCount = 0, errorCount = 0, retryCount = 0;
for (NotifyTaskEntity notifyTask : notifyTaskEntityList) {
// 回调小商城中的groupBuyNotify接口 success 成功,error 失败
diff --git a/group-buying-sys-infrastructure/src/main/java/edu/whut/infrastructure/adapter/repository/TradeRepository.java b/group-buying-sys-infrastructure/src/main/java/edu/whut/infrastructure/adapter/repository/TradeRepository.java
index db33a06..68aebff 100644
--- a/group-buying-sys-infrastructure/src/main/java/edu/whut/infrastructure/adapter/repository/TradeRepository.java
+++ b/group-buying-sys-infrastructure/src/main/java/edu/whut/infrastructure/adapter/repository/TradeRepository.java
@@ -46,6 +46,7 @@ import java.util.concurrent.TimeUnit;
@RequiredArgsConstructor
// todo:逆向后,还要处理 redis recoveryCount
// todo:用户退单后,他的参与活动次数应该释放,应该还能再次参加拼团
+// todo:支付商城端的消息处理,已支付->退款 未支付->定时任务查询->调用拼团系统释放锁单。
public class TradeRepository implements ITradeRepository {
private final IGroupBuyOrderDao groupBuyOrderDao;
diff --git a/group-buying-sys-trigger/src/main/java/edu/whut/trigger/http/MarketIndexController.java b/group-buying-sys-trigger/src/main/java/edu/whut/trigger/http/MarketIndexController.java
index d627d2d..fb36ff2 100644
--- a/group-buying-sys-trigger/src/main/java/edu/whut/trigger/http/MarketIndexController.java
+++ b/group-buying-sys-trigger/src/main/java/edu/whut/trigger/http/MarketIndexController.java
@@ -32,7 +32,8 @@ public class MarketIndexController implements IMarketIndexService {
private final IIndexGroupBuyMarketService indexGroupBuyMarketService;
- @RateLimiterAccessInterceptor(key = "userId", fallbackMethod = "queryGroupBuyMarketConfigFallBack", permitsPerSecond = 1.0d, blacklistCount = 1)
+ // 每秒放 5 个令牌,超限 5 次后算进黑名单
+ @RateLimiterAccessInterceptor(key = "userId", fallbackMethod = "queryGroupBuyMarketConfigFallBack", permitsPerSecond = 5.0d, blacklistCount = 5)
@PostMapping("/query_group_buy_market_config")
@Override
public Response queryGroupBuyMarketConfig(