From e928bc6c4911e87ad89fb9cb155de4a7bc35435e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 12 二月 2025 23:00:48 +0800
Subject: [PATCH] bug修改
---
src/main/java/com/taoke/autopay/service/impl/UserSettingServiceImpl.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/taoke/autopay/service/impl/UserSettingServiceImpl.java b/src/main/java/com/taoke/autopay/service/impl/UserSettingServiceImpl.java
index 0dd9c39..6587964 100644
--- a/src/main/java/com/taoke/autopay/service/impl/UserSettingServiceImpl.java
+++ b/src/main/java/com/taoke/autopay/service/impl/UserSettingServiceImpl.java
@@ -2,7 +2,9 @@
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
+import com.taoke.autopay.dto.ChannelOrderCountDTO;
import com.taoke.autopay.dto.UserSubmitKeyLimitDto;
+import com.taoke.autopay.entity.OrderChannelEnum;
import com.taoke.autopay.entity.SystemConfigKeyEnum;
import com.taoke.autopay.service.SystemConfigService;
import com.taoke.autopay.service.UserSettingService;
@@ -33,7 +35,7 @@
limit = new ArrayList<>();
}
limit.sort((UserSubmitKeyLimitDto o1, UserSubmitKeyLimitDto o2) ->
- o2.getTotalCount() - o1.getTotalCount());
+ o1.getOrderType()==o2.getOrderType() ? o2.getBeforeCount() - o1.getBeforeCount():o1.getOrderType() - o2.getOrderType());
systemConfigService.setValue(SystemConfigKeyEnum.USER_SUBMIT_KEY_COUNT_LIMIT, new Gson().toJson(limit));
}
@@ -53,14 +55,22 @@
}
@Override
- public int getLimitCountByTotalCount(int totalCount) {
+ public int getLimitCountByTotalCount(int orderType, long beforeCount, OrderChannelEnum orderChannel) {
List<UserSubmitKeyLimitDto> list = getUserSubmitKeyCountList(true);
- if (list.size() == 0) {
+ if (list.isEmpty()) {
return Integer.MAX_VALUE;
}
for (UserSubmitKeyLimitDto t : list) {
- if (totalCount >= t.getTotalCount()) {
- return t.getPerCount();
+ if(t.getOrderType()!=orderType){
+ continue;
+ }
+ if (beforeCount >= t.getBeforeCount()) {
+ for(ChannelOrderCountDTO tt:t.getTodayOrderCountList()){
+ if(tt.getOrderChannel() ==orderChannel){
+ return tt.getOrderCount();
+ }
+ }
+ return Integer.MAX_VALUE;
}
}
return Integer.MAX_VALUE;
--
Gitblit v1.8.0