From 8b8107bd49883bd1db7b5ec8cafdec956923f21b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Wed, 15 Oct 2025 16:29:37 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=97=A5=E6=9C=89=E7=A4=BC=E6=A6=82?= =?UTF-8?q?=E8=BF=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/czg/controller/admin/BirthdayGiftController.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cash-api/market-server/src/main/java/com/czg/controller/admin/BirthdayGiftController.java b/cash-api/market-server/src/main/java/com/czg/controller/admin/BirthdayGiftController.java index bea62b11..b0447fa5 100644 --- a/cash-api/market-server/src/main/java/com/czg/controller/admin/BirthdayGiftController.java +++ b/cash-api/market-server/src/main/java/com/czg/controller/admin/BirthdayGiftController.java @@ -1,5 +1,7 @@ package com.czg.controller.admin; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.StrUtil; import com.czg.annotation.SaAdminCheckPermission; import com.czg.market.dto.MkBirthdayGiftDTO; import com.czg.market.service.MkBirthdayGiftService; @@ -64,8 +66,8 @@ public class BirthdayGiftController { */ @SaAdminCheckPermission(value = "birthdayGift:summary", name = "生日有礼概述") @GetMapping("/summary") - public CzgResult summary(@RequestParam(required = false) LocalDateTime dateTime, @RequestParam(required = false) String key) { - return CzgResult.success(service.summary(StpKit.USER.getMainShopId(), key, dateTime)); + public CzgResult summary(@RequestParam(required = false) String dateTime, @RequestParam(required = false) String key) { + return CzgResult.success(service.summary(StpKit.USER.getMainShopId(), key, StrUtil.isNotBlank(dateTime) ? DateUtil.parseLocalDateTime(dateTime) : null)); // return null; }