From f318c9c7c127b00f353bf45f273096d1dc4b424f Mon Sep 17 00:00:00 2001
From: admin <1101184511@qq.com>
Date: 星期三, 20 八月 2025 01:10:48 +0800
Subject: [PATCH] 功能完善
---
src/main/java/com/taoke/autopay/service/impl/js2/OrderTaskServiceImpl.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/taoke/autopay/service/impl/js2/OrderTaskServiceImpl.java b/src/main/java/com/taoke/autopay/service/impl/js2/OrderTaskServiceImpl.java
index c42006e..05f057e 100644
--- a/src/main/java/com/taoke/autopay/service/impl/js2/OrderTaskServiceImpl.java
+++ b/src/main/java/com/taoke/autopay/service/impl/js2/OrderTaskServiceImpl.java
@@ -58,7 +58,7 @@
throw new OrderTaskException(OrderTaskException.CODE_COMMON, "涓嬪崟浠诲姟闇�姹備笅鍗曟暟閲忎笉鑳戒负绌�");
}
- if(orderTask.getReceiveCycleHours()==null){
+ if(orderTask.getReceiveCycleMinutes()==null){
throw new OrderTaskException(OrderTaskException.CODE_COMMON, "涓嬪崟浠诲姟鏀惰揣鍛ㄦ湡涓嶈兘涓虹┖");
}
@@ -95,7 +95,15 @@
}
return orderTaskMapper.selectByPrimaryKey(id);
}
-
+
+ @Override
+ public List<OrderTask> getOrderTaskByIds(List<Long> ids) {
+ if(ids==null||ids.isEmpty()){
+ return new ArrayList<>();
+ }
+ return orderTaskMapper.listByIds(ids);
+ }
+
@Transactional(rollbackFor = Exception.class)
@Override
public OrderTask getOrderTaskByIdForUpdate(Long id) {
@@ -203,13 +211,18 @@
}
}
// 缁熻鎵�鏈夎澶囨鍦ㄦ墽琛屼换鍔＄殑鏁伴噺
-
List<ClientCountDTO> clientCountList = orderTaskExecutionDetailMapper.statisticClientIdsCountByStatus(Arrays.asList( new Integer[]{OrderTaskExecutionDetail.STATUS_NOT_ORDERED}));
Map<Long, Integer> clientCountMap = new HashMap<>();
for(ClientCountDTO dto:clientCountList){
clientCountMap.put(dto.getClientId(), dto.getCount());
}
-
+ // 鍓旈櫎宸茬粡瀛樺湪2涓换鍔′互涓婄殑璁惧
+ for(int i=0;i<clientInfoList.size();i++){
+ if(clientCountMap.containsKey(clientInfoList.get(i).getId())&&clientCountMap.get(clientInfoList.get(i).getId())>=2){
+ clientInfoList.remove(i);
+ i--;
+ }
+ }
clientInfoList.sort(new Comparator<ClientInfo>() {
@Override
--
Gitblit v1.8.0