From 8a89ba02db5c19db669a5cf9bb7d443223bdfb71 Mon Sep 17 00:00:00 2001
From: 刘帅 <rr.iii@qq.com>
Date: 星期二, 29 九月 2026 10:48:21 +0800
Subject: [PATCH] 会员管理及取消场地预约问题
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TicketController.java | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TicketController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TicketController.java
index 5f1507c..43fe181 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TicketController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TicketController.java
@@ -410,26 +410,26 @@
@RequestMapping("/writeOff")
@ResponseBody
public Object writeOff(String id, Integer goType) {
- if (!Integer.valueOf(1).equals(goType) && !Integer.valueOf(2).equals(goType)) {
- return ResultUtil.error("入园方式参数不正确");
- }
- Long aLong = Long.valueOf(id);
WriteOffDTO dto = new WriteOffDTO();
- // 核销人员ID与所属门店由登录上下文确定，不能由前端传入。
- Integer objectId = UserExt.getUser().getId();
- if (UserExt.getUser().getObjectType() == 1){
- dto.setVerifiStoreId(null);
- }else if (UserExt.getUser().getObjectType() == 2){
- TStore store = storeService.getOne(new QueryWrapper<TStore>().eq("cityManagerId", objectId));
- dto.setVerifiStoreId(store == null ? null : store.getId());
- }else{
- TStoreStaff storeByStoreStaffId = storeStaffClient.getStoreByStoreStaffId(objectId);
- dto.setVerifiStoreId(storeByStoreStaffId.getStoreId());
- }
- dto.setId(aLong);
dto.setGoType(goType);
- dto.setVerificationUserId(objectId);
try {
+ if (!Integer.valueOf(1).equals(goType) && !Integer.valueOf(2).equals(goType)) {
+ appendTicketWriteOffAudit(dto, "FAIL", "入园方式参数不正确");
+ return ResultUtil.error("入园方式参数不正确");
+ }
+ dto.setId(Long.valueOf(id));
+ // 核销人员ID与所属门店由登录上下文确定，不能由前端传入。
+ Integer objectId = UserExt.getUser().getId();
+ if (UserExt.getUser().getObjectType() == 1){
+ dto.setVerifiStoreId(null);
+ }else if (UserExt.getUser().getObjectType() == 2){
+ TStore store = storeService.getOne(new QueryWrapper<TStore>().eq("cityManagerId", objectId));
+ dto.setVerifiStoreId(store == null ? null : store.getId());
+ }else{
+ TStoreStaff storeByStoreStaffId = storeStaffClient.getStoreByStoreStaffId(objectId);
+ dto.setVerifiStoreId(storeByStoreStaffId.getStoreId());
+ }
+ dto.setVerificationUserId(objectId);
pointMercharsClient.writeOff(dto);
appendTicketWriteOffAudit(dto, "SUCCESS", null);
return new SuccessTip<>();
@@ -449,7 +449,7 @@
Map<String, Object> afterData = new HashMap<>(beforeData);
afterData.put("status", "已核销");
afterData.put("goType", dto.getGoType());
- afterData.put("goTypeName", dto.getGoType() == 1 ? "手环" : "门票核销");
+ afterData.put("goTypeName", Integer.valueOf(1).equals(dto.getGoType()) ? "手环" : "门票核销");
afterData.put("verificationUserId", dto.getVerificationUserId());
afterData.put("verifiStoreId", dto.getVerifiStoreId());
--
Gitblit v1.7.1