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 | 88 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 85 insertions(+), 3 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 067ad75..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,16 +2,30 @@
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;
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;
/**
- * 硬件方调用 存储惠民卡使用记录
+ * 硬件方调用 存储玩湃惠民卡使用记录
* @author zhibing.pu
* @date 2023/6/24 11:27
*/
@@ -22,12 +36,37 @@
private HuiminRecordService huiminRecordService;
@Resource
private PayHuiminService payHuiminService;
+ @Resource
+ private VipDetailService vipDetailService;
+ @Resource
+ 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);
+ }
/**
- * 硬件开门后回调 存储惠民卡使用记录
+ * 硬件开门后回调 存储玩湃惠民卡使用记录
*/
@PostMapping("/record")
public void aliPayHuiminCallback(Integer id,Integer uid) {
- System.err.println("硬件开门后回调 存储惠民卡使用记录");
+ System.err.println("硬件开门后回调 存储玩湃惠民卡使用记录");
System.err.println("id:"+id);
System.err.println("uid:"+uid);
if (id!=null){
@@ -40,4 +79,47 @@
huiminRecordService.save(huiminRecord);
}
}
+ /**
+ * 硬件开门后回调 存储会员使用明细
+ */
+ @GetMapping("/recordVipDetail")
+ public void recordVipDetail(Integer vipDetail,Integer rid,Integer sid) throws ParseException {
+ System.err.println("硬件开门后回调 存储会员卡门票权益使用记录");
+ System.err.println("vipDetailId:"+vipDetail);
+ System.err.println("rid:"+rid);
+ System.err.println("sid:"+sid);
+ 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(sid));
+ if (!stores.isEmpty()){
+ Store store = stores.get(0);
+ if(store.getOperatorId()==null){
+ vipDetailServiceById.setOperatorId(0);
+ }else{
+ vipDetailServiceById.setOperatorId(store.getOperatorId());
+ }
+ }
+ }
+ // 根据场地id查询运营商id
+ vipDetailServiceById.setUseSiteId(rid);
+ 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");
+ 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