From 639338faeadb596be5463887192471da68134c35 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期三, 04 十二月 2024 14:06:00 +0800
Subject: [PATCH] 1.补充文档
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WalletController.java | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WalletController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WalletController.java
index b71c1de..4f06dcc 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WalletController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WalletController.java
@@ -1,6 +1,5 @@
package com.ruoyi.account.controller;
-import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.account.api.model.AppUser;
import com.ruoyi.account.api.model.BalanceChangeRecord;
@@ -12,15 +11,12 @@
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.other.api.feignClient.OrderClient;
import com.ruoyi.system.api.model.LoginUser;
-import feignClient.RemoteOrderClient;
-import feignClient.RemoteOrderGoodsClient;
+import com.ruoyi.feignClient.RemoteOrderGoodsClient;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
-import model.Order;
-import model.OrderGood;
+import com.ruoyi.model.Order;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -28,11 +24,8 @@
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
+import java.time.*;
import java.util.List;
-import java.util.Map;
import java.util.stream.Collectors;
@Api(tags = "小程序-个人中心-我的钱包")
@@ -70,19 +63,27 @@
@RequestParam(required = false) Integer changeType,
@ApiParam(value = "创建时间")
@RequestParam(required = false)
- @DateTimeFormat(pattern = "yyyy-MM")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
LocalDate createTime) {
Long userId = SecurityUtils.getUserId();
- LocalDateTime localDateTime = null;
+ LocalDateTime startTime = null;
+ LocalDateTime endTime = null;
if (createTime != null) {
- LocalTime specificTime = LocalTime.of(0, 0);
- localDateTime = createTime.atTime(specificTime);
+ // 将 createTime 设置为当天的开始时间 (00:00)
+ startTime = createTime.atStartOfDay();
+
+ // 使用 YearMonth 来获取该月的最后一天
+ YearMonth yearMonth = YearMonth.from(createTime);
+ LocalDate lastDayOfMonth = yearMonth.atEndOfMonth();
+
+ // 将最后一天转换为 LocalDateTime，并设置为当天的最后一秒 (23:59:59.999)
+ endTime = lastDayOfMonth.atTime(LocalTime.MAX);
}
List<BalanceChangeRecord> list = balanceChangeRecordService.list(new LambdaQueryWrapper<BalanceChangeRecord>()
.eq(changeType != null, BalanceChangeRecord::getChangeType, changeType)
- .eq(createTime != null, BalanceChangeRecord::getCreateTime, localDateTime)
+ .between(startTime != null, BalanceChangeRecord::getCreateTime, startTime, endTime)
.eq(BalanceChangeRecord::getAppUserId, userId));
List<Long> orderIds = list.stream().map(BalanceChangeRecord::getOrderId).collect(Collectors.toList());
--
Gitblit v1.7.1