From 572df690f72ed4a077d934823f261dec39b3cc7d Mon Sep 17 00:00:00 2001
From: 刘帅 <rr.iii@qq.com>
Date: 星期二, 08 九月 2026 17:11:34 +0800
Subject: [PATCH] feat&bug：文档内容修改
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java | 184 +++++++++++++++++++++++++---------------------
1 files changed, 100 insertions(+), 84 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java
index c4ec3c3..760a91e 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.activity.entity.*;
+import com.dsh.activity.enums.HuiminCardPaymentTypeEnum;
import com.dsh.activity.feignclient.account.AppUserClient;
import com.dsh.activity.feignclient.account.CityClient;
import com.dsh.activity.feignclient.account.StoreStaffClient;
@@ -391,48 +392,53 @@
if (new Date().after(start) && new Date().before(end)) {
//
Date date1 = new Date();
- jsonObject2.put("start_time", simpleDateFormat1.format( date1));
+ jsonObject2.put("start_time", date1.getTime()/ 1000);
date1.setTime(date1.getTime() + 30 * 1000);
if (start.before(end)) {
- jsonObject2.put("end_time", simpleDateFormat1.format( date1));
+ jsonObject2.put("end_time", date1.getTime()/ 1000);
jsonArray.add(jsonObject2);
}
}
- }else{
- // 返回过期的二维码 保证开门失败即可
- JSONObject jsonObject3 = new JSONObject();
- Date date1 = new Date();
- date1.setTime(date1.getTime() - 300 * 1000);
- jsonObject3.put("end_time", simpleDateFormat1.format( date1));
- jsonObject3.put("start_time", simpleDateFormat1.format( date1));
-
- jsonArray.add(jsonObject3);
}
+ }
+ if (jsonArray.isEmpty()){
+ // 返回过期的二维码 保证开门失败即可
+ JSONObject jsonObject3 = new JSONObject();
+ Date date1 = new Date();
+ date1.setTime(date1.getTime() - 300 * 1000);
+ jsonObject3.put("end_time", date1.getTime()/ 1000);
+ jsonObject3.put("start_time", date1.getTime()/ 1000);
+
+ jsonArray.add(jsonObject3);
}
}
}
else{
- // 返回过期的二维码 保证开门失败即可
- JSONObject jsonObject3 = new JSONObject();
- Date date1 = new Date();
- date1.setTime(date1.getTime() - 300 * 1000);
- jsonObject3.put("end_time", simpleDateFormat1.format( date1));
- jsonObject3.put("start_time", simpleDateFormat1.format( date1));
+ if (jsonArray.isEmpty()){
+ // 返回过期的二维码 保证开门失败即可
+ JSONObject jsonObject3 = new JSONObject();
+ Date date1 = new Date();
+ date1.setTime(date1.getTime() - 300 * 1000);
+ jsonObject3.put("end_time", date1.getTime()/ 1000);
+ jsonObject3.put("start_time", date1.getTime()/ 1000);
- jsonArray.add(jsonObject3);
+ jsonArray.add(jsonObject3);
+ }
}
if (!jsonArray.isEmpty()) {
huiminCardVO1.setEndTime(simpleDateFormat.format(payHuimin.getEndTime()));
TStudent tStudent = tStudents.stream().filter(e -> e.getId().equals(Integer.valueOf(payHuimin.getStudentId().split(",")[0]))).findFirst().orElse(null);
if (tStudent!=null){
huiminCardVO1.setStudentName(tStudent.getName());
- String temp = "{\"id\":"+payHuimin.getId() + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + tStudent.getId() + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 + "}";
+// String temp = "{\"id\":"+payHuimin.getId() + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + tStudent.getId() + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 + ",\"codeType\":"+4+"\"dataId\":"+payHuimin.getId()+"}";
+ String temp = "{\"id\":"+payHuimin.getId() + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + tStudent.getId() + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 +"}";
huiminCardVO1.setQrCode(temp);
}else{
huiminCardVO1.setStudentName("");
- String temp = "{\"id\":"+payHuimin.getId() + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + tStudent.getId() + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 + "}";
+// String temp = "{\"id\":"+payHuimin.getId() + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + 0 + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 + ",\"codeType\":"+4+"\"dataId\":"+payHuimin.getId()+"}";
+ String temp = "{\"id\":"+payHuimin.getId() + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + 0 + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 +"}";
huiminCardVO1.setQrCode(temp);
}
huiminCardVOS.add(huiminCardVO1);
@@ -559,36 +565,39 @@
Date start = DateUtil.parse(s1, "yyyy-MM-dd HH:mm:ss");
Date end = DateUtil.parse(e1, "yyyy-MM-dd HH:mm:ss");
if (new Date().after(start) && new Date().before(end)) {
-//
+//
Date date1 = new Date();
- jsonObject2.put("start_time", simpleDateFormat1.format( date1));
+ jsonObject2.put("start_time", date1.getTime()/ 1000);
date1.setTime(date1.getTime() + 30 * 1000);
if (start.before(end)) {
- jsonObject2.put("end_time", simpleDateFormat1.format( date1));
+ jsonObject2.put("end_time", date1.getTime()/ 1000);
jsonArray.add(jsonObject2);
}
}
- }else{
- // 返回过期的二维码 保证开门失败即可
- JSONObject jsonObject3 = new JSONObject();
- Date date1 = new Date();
- date1.setTime(date1.getTime() - 300 * 1000);
- jsonObject3.put("end_time", simpleDateFormat1.format( date1));
- jsonObject3.put("start_time", simpleDateFormat1.format( date1));
-
- jsonArray.add(jsonObject3);
}
+ }
+ if (jsonArray.isEmpty()){
+ // 返回过期的二维码 保证开门失败即可
+ JSONObject jsonObject3 = new JSONObject();
+ Date date1 = new Date();
+ date1.setTime(date1.getTime() - 300 * 1000);
+ jsonObject3.put("end_time", date1.getTime()/ 1000);
+ jsonObject3.put("start_time", date1.getTime()/ 1000);
+
+ jsonArray.add(jsonObject3);
}
}
}else{
- // 返回过期的二维码 保证开门失败即可
- JSONObject jsonObject = new JSONObject();
- Date date1 = new Date();
- date1.setTime(date1.getTime() - 300 * 1000);
- jsonObject.put("end_time", simpleDateFormat1.format( date1));
- jsonObject.put("start_time", simpleDateFormat1.format( date1));
+ if (jsonArray.isEmpty()){
+ // 返回过期的二维码 保证开门失败即可
+ JSONObject jsonObject3 = new JSONObject();
+ Date date1 = new Date();
+ date1.setTime(date1.getTime() - 300 * 1000);
+ jsonObject3.put("end_time", date1.getTime()/ 1000);
+ jsonObject3.put("start_time", date1.getTime()/ 1000);
- jsonArray.add(jsonObject);
+ jsonArray.add(jsonObject3);
+ }
}
if (!jsonArray.isEmpty()) {
// 将学员加入
@@ -691,43 +700,48 @@
if (new Date().after(start) && new Date().before(end)) {
//
Date date1 = new Date();
- jsonObject2.put("start_time", simpleDateFormat1.format( date1));
+ jsonObject2.put("start_time", date1.getTime()/ 1000);
date1.setTime(date1.getTime() + 30 * 1000);
if (start.before(end)) {
- jsonObject2.put("end_time", simpleDateFormat1.format( date1));
+ jsonObject2.put("end_time", date1.getTime()/ 1000);
jsonArray.add(jsonObject2);
}
}
- }else{
- // 返回过期的二维码 保证开门失败即可
- JSONObject jsonObject3 = new JSONObject();
- Date date1 = new Date();
- date1.setTime(date1.getTime() - 300 * 1000);
- jsonObject3.put("end_time", simpleDateFormat1.format( date1));
- jsonObject3.put("start_time", simpleDateFormat1.format( date1));
-
- jsonArray.add(jsonObject3);
}
+ }
+ if (jsonArray.isEmpty()){
+ // 返回过期的二维码 保证开门失败即可
+ JSONObject jsonObject3 = new JSONObject();
+ Date date1 = new Date();
+ date1.setTime(date1.getTime() - 300 * 1000);
+ jsonObject3.put("end_time", date1.getTime()/ 1000);
+ jsonObject3.put("start_time", date1.getTime()/ 1000);
+
+ jsonArray.add(jsonObject3);
}
}
}else{
- // 返回过期的二维码 保证开门失败即可
- JSONObject jsonObject = new JSONObject();
- Date date1 = new Date();
- date1.setTime(date1.getTime() - 300 * 1000);
- jsonObject.put("end_time", simpleDateFormat1.format( date1));
- jsonObject.put("start_time", simpleDateFormat1.format( date1));
+ if (jsonArray.isEmpty()){
+ // 返回过期的二维码 保证开门失败即可
+ JSONObject jsonObject3 = new JSONObject();
+ Date date1 = new Date();
+ date1.setTime(date1.getTime() - 300 * 1000);
+ jsonObject3.put("end_time", date1.getTime()/ 1000);
+ jsonObject3.put("start_time", date1.getTime()/ 1000);
- jsonArray.add(jsonObject);
+ jsonArray.add(jsonObject3);
+ }
}
TStudent tStudent = tStudents.stream().filter(e -> e.getId().equals(studentId)).findFirst().orElse(null);
if (tStudent!=null){
huiminCardStudentVO.setStudentName(tStudent.getName());
- String temp = "{\"id\":"+tPayHuimin.getId() + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + tStudent.getId() + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 + "}";
+// String temp = "{\"id\":"+tPayHuimin.getId() + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + tStudent.getId() + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 + ",\"codeType\":"+4+"\"dataId\":"+tPayHuimin.getId()+"}";
+ String temp = "{\"id\":"+tPayHuimin.getId() + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + tStudent.getId() + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 +"}";
huiminCardStudentVO.setQrCode(temp);
}else{
huiminCardStudentVO.setStudentName("");
- String temp = "{\"id\":"+tPayHuimin.getId() + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + tStudent.getId() + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 + "}";
+// String temp = "{\"id\":"+tPayHuimin.getId() + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + 0 + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 + ",\"codeType\":"+4+"\"dataId\":"+tPayHuimin.getId()+"}";
+ String temp = "{\"id\":"+tPayHuimin.getId() + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + 0 + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 +"}";
huiminCardStudentVO.setQrCode(temp);
}
@@ -821,14 +835,11 @@
return ResultUtil.tokenErr();
}
TPayHuimin tPayHuimin = payHuiminService.getById(id);
- if (tPayHuimin.getPaymentType()==3){
- // 后台录入直接退款
- tPayHuimin.setStatus(3);
- payHuiminService.updateById(tPayHuimin);
- return ResultUtil.success();
- }
if (tPayHuimin == null) {
return ResultUtil.error("订单不存在");
+ }
+ if (HuiminCardPaymentTypeEnum.isGift(tPayHuimin.getPaymentType())){
+ return ResultUtil.error("赠送惠民卡不允许退款");
}
if (tPayHuimin.getStatus() == 3 && tPayHuimin.getRefundStatus() != 1) {
return ResultUtil.error("不可重复退款");
@@ -956,37 +967,41 @@
if (new Date().after(start) && new Date().before(end)) {
//
Date date1 = new Date();
- jsonObject2.put("start_time", simpleDateFormat1.format( date1));
+ jsonObject2.put("start_time", date1.getTime()/ 1000);
date1.setTime(date1.getTime() + 30 * 1000);
if (start.before(end)) {
- jsonObject2.put("end_time", simpleDateFormat1.format( date1));
+ jsonObject2.put("end_time", date1.getTime()/ 1000);
jsonArray.add(jsonObject2);
}
}
- }else{
- // 返回过期的二维码 保证开门失败即可
- JSONObject jsonObject3 = new JSONObject();
- Date date1 = new Date();
- date1.setTime(date1.getTime() - 300 * 1000);
- jsonObject3.put("end_time", simpleDateFormat1.format( date1));
- jsonObject3.put("start_time", simpleDateFormat1.format( date1));
-
- jsonArray.add(jsonObject3);
}
+ }
+ if (jsonArray.isEmpty()){
+ // 返回过期的二维码 保证开门失败即可
+ JSONObject jsonObject3 = new JSONObject();
+ Date date1 = new Date();
+ date1.setTime(date1.getTime() - 300 * 1000);
+ jsonObject3.put("end_time", date1.getTime()/ 1000);
+ jsonObject3.put("start_time", date1.getTime()/ 1000);
+
+ jsonArray.add(jsonObject3);
}
}
}else{
- // 返回过期的二维码 保证开门失败即可
- JSONObject jsonObject = new JSONObject();
- Date date1 = new Date();
- date1.setTime(date1.getTime() - 300 * 1000);
- jsonObject.put("end_time", simpleDateFormat1.format( date1));
- jsonObject.put("start_time", simpleDateFormat1.format( date1));
+ if (jsonArray.isEmpty()){
+ // 返回过期的二维码 保证开门失败即可
+ JSONObject jsonObject3 = new JSONObject();
+ Date date1 = new Date();
+ date1.setTime(date1.getTime() - 300 * 1000);
+ jsonObject3.put("end_time", date1.getTime()/ 1000);
+ jsonObject3.put("start_time", date1.getTime()/ 1000);
- jsonArray.add(jsonObject);
+ jsonArray.add(jsonObject3);
+ }
}
- String temp = "{\"id\":"+tPayHuimin.getId() + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + tPayHuimin.getStudentId().split(",")[0] + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 + "}";
+// String temp = "{\"id\":"+tPayHuimin.getId() + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + tPayHuimin.getStudentId().split(",")[0] + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 + ",\"codeType\":"+4+"\"dataId\":"+tPayHuimin.getId()+"}";
+ String temp = "{\"id\":"+tPayHuimin.getId() + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + tPayHuimin.getStudentId().split(",")[0] + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 +"}";
myHuiminCardDetailVO.setQrCode(temp);
myHuiminCardDetailVO.setCardId(tPayHuimin.getCardId());
myHuiminCardDetailVO.setHuiminCard(byId);
@@ -1002,6 +1017,7 @@
}
}
+
/**
* 获取添加人员、选择人员说明文案
*/
--
Gitblit v1.7.1