From 156b3bc3387f2eb2d2815dfc33a86590dbe5d002 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 26 八月 2025 22:06:08 +0800
Subject: [PATCH] 硬件回调
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminRecordController.java | 17 ++++++++++++++---
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 2 +-
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminRecordController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminRecordController.java
index 43627d5..ad08911 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminRecordController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminRecordController.java
@@ -8,11 +8,14 @@
import com.dsh.activity.feignclient.other.model.Site;
import com.dsh.activity.feignclient.other.model.Store;
import com.dsh.activity.service.*;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
@@ -56,8 +59,8 @@
/**
* 硬件开门后回调 存储会员使用明细
*/
- @PostMapping("/recordVipDetail")
- public void recordVipDetail(Integer vipDetailId,Integer rid,Integer sid) {
+ @GetMapping("/recordVipDetail")
+ public void recordVipDetail(Integer vipDetailId,Integer rid,Integer sid) throws ParseException {
System.err.println("硬件开门后回调 存储会员卡门票权益使用记录");
System.err.println("vipDetailId:"+vipDetailId);
System.err.println("rid:"+rid);
@@ -77,9 +80,17 @@
vipDetailServiceById.setUseStoreId(sid);
vipDetailServiceById.setStatus(2);
vipDetailServiceById.setStartTime(new Date());
- vipDetailServiceById.setEndTime(new Date());
+ // 获取今天的晚上23:59:59
+ // 获取今天的晚上23:59:59
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String today = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
+ String endOfDayStr = today + " 23:59:58";
+ Date endOfDay = sdf.parse(endOfDayStr);
+ vipDetailServiceById.setEndTime(endOfDay);
vipDetailService.updateById(vipDetailServiceById);
}
}
+
+
}
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 ee55769..231fef5 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
@@ -838,7 +838,7 @@
public ExchangeDetailsVo getIntegralExchangeDetails(@RequestBody Integer appUserId) {
ExchangeDetailsVo detailsVo = new ExchangeDetailsVo();
List<ExchangeDetailsResponse> responses = new ArrayList<>();
- SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
List<UserPointsMerchandise> pointsMerchandises = upmseService.list(new QueryWrapper<UserPointsMerchandise>()
.eq("userId", appUserId).eq("payStatus", 2));
--
Gitblit v1.7.1