From db5ea69bd9bfca00e72c3d8d3a80bb5db991c75d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 06 一月 2026 14:48:21 +0800
Subject: [PATCH] bug修改 全部代码提交
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminRecordController.java | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 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 3ca3a2e..3b4070f 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
@@ -2,12 +2,16 @@
import com.dsh.activity.entity.THuiminRecord;
import com.dsh.activity.entity.TPayHuimin;
+import com.dsh.activity.entity.UserPointsMerchandise;
import com.dsh.activity.entity.VipDetail;
import com.dsh.activity.feignclient.other.SiteClient;
import com.dsh.activity.feignclient.other.StoreClient;
import com.dsh.activity.feignclient.other.model.Site;
import com.dsh.activity.feignclient.other.model.Store;
import com.dsh.activity.service.*;
+import com.dsh.activity.util.ResultUtil;
+import com.dsh.activity.util.UUIDUtil;
+import io.swagger.models.auth.In;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -38,6 +42,25 @@
private SiteClient siteClient;
@Resource
private StoreClient storeClient;
+ @Resource
+ private UserPointsMerchandiseService userPointsMerchandiseService;
+ // 补偿接口 赠送门票
+ @GetMapping("/grantTicket")
+ public void grantTicket(Integer userId, Integer id) throws Exception {
+ UserPointsMerchandise userPointsMerchandise = new UserPointsMerchandise();
+ userPointsMerchandise.setPointsMerchandiseId(id);
+ userPointsMerchandise.setUserId(userId);
+ userPointsMerchandise.setStatus(1);
+ userPointsMerchandise.setInsertTime(new Date());
+ userPointsMerchandise.setPayType(1);
+ userPointsMerchandise.setGoodsNumber(1);
+ userPointsMerchandise.setCode(UUIDUtil.getTimeStr() + UUIDUtil.getNumberRandom(5));
+ userPointsMerchandise.setPayStatus(2);
+ userPointsMerchandise.setState(1);
+ userPointsMerchandise.setCashPayType(1);
+ userPointsMerchandise.setPaymentTime(new Date());
+ userPointsMerchandiseService.save(userPointsMerchandise);
+ }
/**
* 硬件开门后回调 存储玩湃惠民卡使用记录
*/
@@ -73,7 +96,11 @@
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
@@ -81,6 +108,7 @@
vipDetailServiceById.setUseStoreId(sid);
vipDetailServiceById.setStatus(2);
vipDetailServiceById.setStartTime(new Date());
+ vipDetailServiceById.setUseTime(new Date());
// 获取今天的晚上23:59:59
// 获取今天的晚上23:59:59
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
--
Gitblit v1.7.1