From 320e9165ac6cc6d90978fbef3074a8ed9add1790 Mon Sep 17 00:00:00 2001 From: Administrator <1101184511@qq.com> Date: 星期五, 09 五月 2025 01:21:32 +0800 Subject: [PATCH] 后台管理页面完成 --- src/main/java/com/taoke/autopay/controller/admin/credit/UserCreditExchangeRecordAdminController.java | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 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 bf4ea9b..926004f 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 @@ -22,6 +22,7 @@ import javax.annotation.Resource; import java.io.IOException; +import java.util.ArrayList; import java.util.Arrays; import java.util.Date; import java.util.List; @@ -92,7 +93,7 @@ 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.sortList = Arrays.asList(new String[]{"create_time desc"}); query.start = (long) (page - 1) * limit; query.count = limit; @@ -114,16 +115,31 @@ int successCount = 0; int failCount = 0; JSONArray idsArray = JSONArray.fromObject(ids); + List<String> errorMsgList=new ArrayList<>(); for (int i = 0; i < idsArray.size(); i++) { long id = idsArray.optLong(i); try { userCreditExchangeManager.approveExchange(id); successCount += 1; } catch (UserCreditExchangeException e) { + errorMsgList.add(e.getMessage()); failCount += 1; + userCreditExchangeRecordService.updateExchangeRecord(CreditExchangeRecord.builder() + .id(id) + .exchangeStatusDescription(e.getMessage()) + .updateTime(new Date()) + .build()); } } - return JsonUtil.loadFalseResult(String.format("鎴愬姛閫氳繃 %d 鏉¤褰� 閫氳繃寮傚父 %d 鏉¤褰�", successCount, failCount)); + if(idsArray.size()>1) { + return JsonUtil.loadFalseResult(String.format("鎴愬姛閫氳繃 %d 鏉¤褰� 閫氳繃寮傚父 %d 鏉¤褰�", successCount, failCount)); + }else{ + if(!errorMsgList.isEmpty()) { + return JsonUtil.loadFalseResult(errorMsgList.get(0)); + }else{ + return JsonUtil.loadTrueResult("閫氳繃鎴愬姛"); + } + } } /** -- Gitblit v1.8.0