From 01d8de48c76467ff3b99b204e66d3ef86506fa52 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期四, 25 七月 2024 18:23:40 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java
index c952541..8086944 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java
@@ -26,6 +26,7 @@
import java.util.Date;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
/**
* 系统设置控制器
@@ -120,7 +121,8 @@
@RequestMapping(value = "/redSet/list")
@ResponseBody
public Object redSetList() {
-
+ List<String> strings = new ArrayList<>();
+ strings.add("updateTime");
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
if (ShiroKit.getUser().getRoleType() != 1){
page.setRecords(null);
@@ -129,7 +131,16 @@
for (Map<String, Object> stringObjectMap : list) {
stringObjectMap.put(stringObjectMap.get("deductionRatio").toString(),stringObjectMap.get("deductionRatio")+"%");
}
- page.setRecords(list);
+ List<Map<String, Object>> sortedList = list.stream()
+ .sorted((map1, map2) -> {
+ // 获取 updateTime 字段
+ String time1 = map1.get("updateTime").toString();
+ String time2 = map2.get("updateTime").toString();
+ // 倒序排列
+ return time2.compareTo(time1);
+ })
+ .collect(Collectors.toList());
+ page.setRecords(sortedList);
}
return super.packForBT(page);
}
@@ -148,7 +159,12 @@
String s = replace + ":00";
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date date = dateFormat.parse(s);
+ if (date.before(new Date())){
+ // 选择的生效时间不能小于当前时间
+ return 501;
+ }
tSysRedSet.setInsertTime(new Date());
+ tSysRedSet.setUpdateTime(new Date());
tSysRedSet.setEffectiveDate(date);
tSysRedSet.setStatus(1);
redEnvelopePaymentSettingsService.insert(tSysRedSet);
@@ -167,7 +183,7 @@
String s = replace + ":00";
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date date = dateFormat.parse(s);
- tSysRedSet.setInsertTime(date);
+ tSysRedSet.setEffectiveDate(date);
tSysRedSet.setUpdateTime(new Date());
redEnvelopePaymentSettingsService.updateById(tSysRedSet);
return SUCCESS_TIP;
--
Gitblit v1.7.1