From 39bd9f965dfb48925a66fcd80787144b7541b866 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期日, 09 二月 2025 18:30:30 +0800
Subject: [PATCH] bug修改
---
src/main/java/com/taoke/autopay/controller/admin/AdminAgentSettleController.java | 42 ++++++++++++++++++++++++++++++++++++------
1 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/taoke/autopay/controller/admin/AdminAgentSettleController.java b/src/main/java/com/taoke/autopay/controller/admin/AdminAgentSettleController.java
index bf9b538..baf88e8 100644
--- a/src/main/java/com/taoke/autopay/controller/admin/AdminAgentSettleController.java
+++ b/src/main/java/com/taoke/autopay/controller/admin/AdminAgentSettleController.java
@@ -102,10 +102,11 @@
@ResponseBody
@RequestMapping("list")
- public String listAgent(String key, String day, int page, int limit) {
+ public String listAgent(String key, String startDay,String endDay, int page, int limit) {
//鍏堟煡璇㈡墍鏈夌殑鏁版嵁
ChannelAgentSettleRecordMapper.DaoQuery query = new ChannelAgentSettleRecordMapper.DaoQuery();
- query.settleDay = com.taoke.autopay.utils.StringUtil.isNullOrEmpty(day)?null:day;
+ query.minSettleDay = com.taoke.autopay.utils.StringUtil.isNullOrEmpty(startDay)?null:startDay;
+ query.maxSettleDay = com.taoke.autopay.utils.StringUtil.isNullOrEmpty(endDay)?null:endDay;
query.sortList = Arrays.asList(new String[]{"_create_time desc"});
query.start = (long) (page - 1) * limit;
query.count = limit;
@@ -126,11 +127,39 @@
return JsonUtil.loadTrueResult("");
}
+ /**
+ * @author hxh
+ * @description 寮�濮嬬粨绠�
+ * @date 0:28 2024/10/14
+ * @param: startDay 寮�濮嬫棩鏈�
+ * @param: endDay 缁撴潫鏃ユ湡
+ * @return java.lang.String
+ **/
@ResponseBody
@RequestMapping("startSettle")
- public String startSettle(String day) {
+ public String startSettle(String startDay, String endDay) {
+ if(StringUtil.isNullOrEmpty(startDay)||StringUtil.isNullOrEmpty(endDay)){
+ return JsonUtil.loadFalseResult("缁撶畻鏃ユ湡杈撳叆涓嶅畬鏁�");
+ }
+ if(Integer.parseInt(startDay.replace("-",""))>Integer.parseInt(endDay.replace("-",""))){
+ return JsonUtil.loadFalseResult("寮�濮嬫棩鏈熶笉鑳藉ぇ浜庣粨鏉熸棩鏈�");
+ }
+
+ long startTimeStamp = TimeUtil.convertToTimeTemp(startDay,"yyyy-MM-dd");
+ long endTimeStamp = TimeUtil.convertToTimeTemp(endDay,"yyyy-MM-dd");
+
+ List<String> days=new ArrayList<>();
+ for(int i=0;i<100;i++){
+ if(endTimeStamp< startTimeStamp + i*24*60*60*1000L){
+ break;
+ }
+ days.add(TimeUtil.getGernalTime(startTimeStamp + i*24*60*60*1000L,"yyyy-MM-dd"));
+ }
+
try {
- channelAgentSettleService.startSettle(day);
+ for(String day:days) {
+ channelAgentSettleService.startSettle(day);
+ }
return JsonUtil.loadTrueResult("");
} catch (ChannelAgentSettleException e) {
return JsonUtil.loadFalseResult(e.getMessage());
@@ -213,9 +242,10 @@
@RequestMapping("downloadSettleTable")
- public void downloadSettleTable(String day, HttpServletResponse response) throws IOException {
+ public void downloadSettleTable(String startDay,String endDay, HttpServletResponse response) throws IOException {
ChannelAgentSettleRecordMapper.DaoQuery daoQuery=new ChannelAgentSettleRecordMapper.DaoQuery();
- daoQuery.settleDay = day;
+ daoQuery.minSettleDay = com.taoke.autopay.utils.StringUtil.isNullOrEmpty(startDay)?null:startDay;
+ daoQuery.maxSettleDay = com.taoke.autopay.utils.StringUtil.isNullOrEmpty(endDay)?null:endDay;
daoQuery.count = 10000;
daoQuery.status = ChannelAgentSettleRecord.STATUS_NOT_SETTLE;
List<ChannelAgentSettleRecord> list = channelAgentSettleService.list(daoQuery);
--
Gitblit v1.8.0