From f0755617c4fb6869cbead7e57528aa9ff020dd8d Mon Sep 17 00:00:00 2001
From: Administrator <1101184511@qq.com>
Date: 星期二, 22 四月 2025 00:56:53 +0800
Subject: [PATCH] 后台管理页面完成
---
src/main/java/com/taoke/autopay/controller/admin/credit/UserCreditExchangeRecordAdminController.java | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/taoke/autopay/controller/admin/credit/UserCreditExchangeRecordAdminController.java b/src/main/java/com/taoke/autopay/controller/admin/credit/UserCreditExchangeRecordAdminController.java
index 9bcbd40..d2d3039 100644
--- a/src/main/java/com/taoke/autopay/controller/admin/credit/UserCreditExchangeRecordAdminController.java
+++ b/src/main/java/com/taoke/autopay/controller/admin/credit/UserCreditExchangeRecordAdminController.java
@@ -32,7 +32,8 @@
@Resource
private UserCreditExchangeManager userCreditExchangeManager;
- private Gson gson = new GsonBuilder().registerTypeAdapter(Date.class, new TypeAdapter<Date>() {
+ private Gson gson = new GsonBuilder()
+ .registerTypeAdapter(Date.class, new TypeAdapter<Date>() {
@Override
public void write(JsonWriter out, Date value) throws IOException {
String desc = "";
@@ -48,7 +49,23 @@
public Date read(JsonReader in) throws IOException {
return new Date();
}
- }).create();
+ }) .registerTypeAdapter(CreditExchangeRecord.ExchangeType.class, new TypeAdapter<CreditExchangeRecord.ExchangeType>() {
+ @Override
+ public void write(JsonWriter out, CreditExchangeRecord.ExchangeType value) throws IOException {
+ String desc = "";
+ if (value != null) {
+ desc = value.getDesc();
+ out.value(desc);
+ } else {
+ out.value("");
+ }
+ }
+
+ @Override
+ public CreditExchangeRecord.ExchangeType read(JsonReader in) throws IOException {
+ return null;
+ }
+ }).create();
@Resource
private CreditExchangeRecordService userCreditExchangeRecordService;
@@ -63,16 +80,16 @@
if (!StringUtil.isNullOrEmpty(search.getUid())) {
query.uid = Long.parseLong(search.getUid());
}
- if (search.getStatus() != null) {
- query.exchangeStatus = search.getStatus();
+ if (!StringUtil.isNullOrEmpty(search.getStatus())) {
+ query.exchangeStatus =Integer.parseInt(search.getStatus());
}
- if (search.getStartDate() != null) {
- query.minCreateTime = new Date(TimeUtil.convertToTimeTemp(search.getStartDate(), "yyyy-MM-dd"));
+ if (!StringUtil.isNullOrEmpty(search.getStart_date())) {
+ query.minCreateTime = new Date(TimeUtil.convertToTimeTemp(search.getStart_date(), "yyyy-MM-dd"));
}
- if (search.getEndDate() != null) {
- query.maxCreateTime = new Date(TimeUtil.convertToTimeTemp(search.getEndDate(), "yyyy-MM-dd"));
+ if (!StringUtil.isNullOrEmpty(search.getEnd_date())) {
+ query.maxCreateTime = new Date(TimeUtil.convertToTimeTemp(search.getEnd_date(), "yyyy-MM-dd")+1000*60*60*24L);
}
query.sortList = Arrays.asList(new String[]{"_create_time desc"});
query.start = (long) (page - 1) * limit;
--
Gitblit v1.8.0