From aa2c6d722ed799290285b6365f011aaa74373d73 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期六, 23 十二月 2023 17:30:07 +0800
Subject: [PATCH] 11.27,9

---
 cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
index 4c33f44..d46c314 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
@@ -934,14 +934,11 @@
                         String endDate = dateFormat.format(end);
                         detailsResponse.setStartTime(startDate);
                         detailsResponse.setEndTime(startDate);
-
                         Date now = new Date();
                         Calendar cal1 = Calendar.getInstance();
                         cal1.setTime(pointsMerchandise.getInsertTime());
-
                         Calendar cal2 = Calendar.getInstance();
                         cal2.setTime(now);
-
                         // Compare the year, month, and day of the two Calendar instances
                         boolean isSameDate = cal1.get(Calendar.YEAR) == cal2.get(Calendar.YEAR) &&
                                 cal1.get(Calendar.MONTH) == cal2.get(Calendar.MONTH) &&

--
Gitblit v1.7.1