From 64bbbd0b310f645f29fbe3b142e16ef6abb87594 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 11 四月 2025 20:08:29 +0800
Subject: [PATCH] bug修改
---
cloud-server-activity/src/main/resources/mapper/HuiminCardMapper.xml | 6 ++++--
cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminCallBack.java | 2 +-
cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java | 11 ++++++++++-
3 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminCallBack.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminCallBack.java
index 9d7f5f4..dc5c192 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminCallBack.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminCallBack.java
@@ -84,7 +84,7 @@
Map<String, String> map = payMoneyUtil.alipayCallback(request);
if (null != map) {
String out_trade_no = map.get("out_trade_no");
- String transaction_id = map.get("transaction_id");
+ String transaction_id = map.get("trade_no");
TPayHuimin one = payHuiminService.getOne(new LambdaQueryWrapper<TPayHuimin>().eq(TPayHuimin::getCode, out_trade_no));
if (one!=null){
if (one.getStatus()==2){
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 e48fc69..2115a99 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
@@ -132,7 +132,6 @@
case 2:
// 年内卡
Date date1 = new Date();
-
date1.setMonth(11);
date1.setDate(31);
date1.setHours(23);
@@ -167,6 +166,7 @@
}
return ResultUtil.success();
}
+
/**
* 查看惠民卡详情
@@ -435,6 +435,15 @@
return ResultUtil.success(new ArrayList<>());
}
}
+
+ public static void main(String[] args) {
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ LocalDateTime localDateTime = LocalDateTime.now().plusDays(365);
+ // 将LocalDateTime转换为Date类型
+ Date date = Date.from(localDateTime.atZone(ZoneId.systemDefault()).toInstant());
+ String format = simpleDateFormat.format(date);
+ System.err.println(format);
+ }
/**
* 个人中心-我的惠民卡-查看详情
*/
diff --git a/cloud-server-activity/src/main/resources/mapper/HuiminCardMapper.xml b/cloud-server-activity/src/main/resources/mapper/HuiminCardMapper.xml
index 847863f..a727d27 100644
--- a/cloud-server-activity/src/main/resources/mapper/HuiminCardMapper.xml
+++ b/cloud-server-activity/src/main/resources/mapper/HuiminCardMapper.xml
@@ -7,7 +7,8 @@
select t1.* from t_huimin_card t1
where
find_in_set(#{storeId},t1.storeIds)
-
+ and t1.startTime <= now()
+ and t1.endTime >= now()
and t1.status = 1
order by t1.sort desc
@@ -18,7 +19,8 @@
select t1.* from t_huimin_card t1
where
find_in_set(#{storeId},t1.storeIds)
-
+ and t1.startTime <= now()
+ and t1.endTime >= now()
and t1.status = 1
order by t1.sort desc
--
Gitblit v1.7.1