From f3228ef06ffc53fdbe3c51b58ed24e5f5686457f Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 03 十一月 2025 20:27:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java
index 97e5734..661414f 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java
@@ -363,10 +363,12 @@
})
public ResultUtil reservationSite(ReservationSite reservationSite) {
try {
- Integer uid = tokenUtil.getUserIdFormRedis();
- if (null == uid) {
- return ResultUtil.tokenErr();
- }
+// Integer uid = tokenUtil.getUserIdFormRedis();
+// if (null == uid) {
+// return ResultUtil.tokenErr();
+// }
+ Integer uid = 201;
+
return siteService.reservationSite(uid, reservationSite);
} catch (Exception e) {
e.printStackTrace();
@@ -634,6 +636,7 @@
HashMap<String, Object> map = new HashMap<>();
System.err.println("预约id"+id);
SiteBooking siteBooking = siteBookingService.getById(id);
+ Integer targetAudience = siteBooking.getTargetAudience();
System.err.println("预约"+siteBooking);
Integer storeId = siteBooking.getStoreId();
Store byId1 = service.getById(storeId);
@@ -644,6 +647,10 @@
map.put("siteType", siteType.getName());
map.put("shopName", byId1.getName());
map.put("shopAddress", byId1.getAddress());
+ // 进场二维码新增参数codeType 1=订场 2=散客，3=门票,玩湃惠民卡codeType=4
+ map.put("codeType", targetAudience);
+ map.put("dataId", siteBooking.getId());
+ System.err.println("订场类型:"+targetAudience);
map.put("name", site.getName());
--
Gitblit v1.7.1