From b1fb83530b7105e4aa73e4101727dea945eb01c2 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 29 八月 2025 21:48:15 +0800
Subject: [PATCH] bug修改
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminRecordController.java | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 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..0121b0c 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,20 +59,25 @@
/**
* 硬件开门后回调 存储会员使用明细
*/
- @PostMapping("/recordVipDetail")
- public void recordVipDetail(Integer vipDetailId,Integer rid,Integer sid) {
+ @GetMapping("/recordVipDetail")
+ public void recordVipDetail(Integer vipDetail,Integer rid,Integer sid) throws ParseException {
System.err.println("硬件开门后回调 存储会员卡门票权益使用记录");
- System.err.println("vipDetailId:"+vipDetailId);
+ System.err.println("vipDetailId:"+vipDetail);
System.err.println("rid:"+rid);
System.err.println("sid:"+sid);
- VipDetail vipDetailServiceById = vipDetailService.getById(vipDetailId);
+ String replace = vipDetail.toString().replace("-", "");
+ VipDetail vipDetailServiceById = vipDetailService.getById(Integer.valueOf( replace));
if (vipDetailServiceById!=null){
Site site = siteClient.querySiteById(rid);
if (site!=null){
- List<Store> stores = storeClient.queryStoreByIds(Arrays.asList(rid));
+ List<Store> stores = storeClient.queryStoreByIds(Arrays.asList(sid));
if (!stores.isEmpty()){
Store store = stores.get(0);
- vipDetailServiceById.setOperatorId(store.getOperatorId());
+ if(store.getOperatorId()==null){
+ vipDetailServiceById.setOperatorId(0);
+ }else{
+ vipDetailServiceById.setOperatorId(store.getOperatorId());
+ }
}
}
// 根据场地id查询运营商id
@@ -77,9 +85,18 @@
vipDetailServiceById.setUseStoreId(sid);
vipDetailServiceById.setStatus(2);
vipDetailServiceById.setStartTime(new Date());
- vipDetailServiceById.setEndTime(new Date());
+ vipDetailServiceById.setUseTime(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);
}
}
+
+
}
--
Gitblit v1.7.1