From 270a3c0208001e2db9577cb6d7d4fd7ec646dfd8 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 04 十一月 2025 21:27:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-other/src/main/java/com/dsh/other/controller/CodeCallBackController.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/CodeCallBackController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/CodeCallBackController.java
index 036a7eb..af2b9f9 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/CodeCallBackController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/CodeCallBackController.java
@@ -1,6 +1,7 @@
package com.dsh.other.controller;
import com.dsh.other.util.ResultUtil;
+import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -19,24 +20,27 @@
* @date 2023/6/24 11:27
*/
@RestController
+@Api(tags = "硬件方调用 存储玩湃惠民卡使用记录")
@RequestMapping("/base/code")
public class CodeCallBackController {
- /**
+ // 进场二维码新增参数codeType 1=订场 2=散客，3=门票,玩湃惠民卡codeType=4
+ /**
* 硬件开门后回调 是否可进场检查接口 sid门店id rid场地id
*/
- @PostMapping("/verify")
- public ResultUtil verify(Integer codeType, Integer rid, Integer sid) {
+ @GetMapping("/verify")
+ public ResultUtil verify(Integer codeType,Integer dataId, Integer rid, Integer sid) {
System.err.println("硬件开门后回调 校验是否可入场");
System.err.println("codeType:"+codeType);
+ System.err.println("dataId:"+dataId);
System.err.println("rid:"+rid);
System.err.println("sid:"+sid);
Date date = new Date();
- // codeType二维码类型 1=订场 2=散客 散客需要校验能否进场
+ // codeType二维码类型1=订场 2=散客，3=门票,玩湃惠民卡codeType=4 234需要校验能否进场
if (codeType==1){
- return ResultUtil.success(true);
+ return ResultUtil.success();
}
- return ResultUtil.success(true);
+ return ResultUtil.success();
}
}
--
Gitblit v1.7.1