From 3c8dc107047c0b5ee407fa36ca2ce06090f75929 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 12 四月 2025 18:05:02 +0800
Subject: [PATCH] bug修改
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 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 e48fc69..c69fdf1 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();
}
+
/**
* 查看惠民卡详情
@@ -221,7 +221,16 @@
.eq(THuiminAgreementSetting::getAgreementId, huiminAgreement.getId()));
huiminCard.setAgreementSettings(list);
}else {
- huiminCard.setAgreementSettings(new ArrayList<>());
+ THuiminAgreement huiminAgreement1 = huiminAgreementService.getOne(new LambdaQueryWrapper<THuiminAgreement>()
+ .isNull(THuiminAgreement::getOperatorId));
+ if (huiminAgreement1!=null){
+ List<THuiminAgreementSetting> list = huiminAgreementSettingService.list(new LambdaQueryWrapper<THuiminAgreementSetting>()
+ .eq(THuiminAgreementSetting::getAgreementId, huiminAgreement1.getId()));
+ huiminCard.setAgreementSettings(list);
+ }else {
+ huiminCard.setAgreementSettings(new ArrayList<>());
+
+ }
}
}
}else{
@@ -273,7 +282,15 @@
}else{
THuiminAgreement one = huiminAgreementService.getOne(new LambdaQueryWrapper<THuiminAgreement>()
.eq(THuiminAgreement::getOperatorId,store.getOperatorId()).last("limit 1"));
- huiminAgreementVO.setIntroduce(one.getStoreNoHuiminCardIntro());
+ if (one == null){
+ THuiminAgreement two = huiminAgreementService.getOne(new LambdaQueryWrapper<THuiminAgreement>()
+ .isNull(THuiminAgreement::getOperatorId).last("limit 1"));
+ huiminAgreementVO.setIntroduce(two.getStoreNoHuiminCardIntro());
+
+ }else{
+ huiminAgreementVO.setIntroduce(one.getStoreNoHuiminCardIntro());
+
+ }
}
@@ -435,6 +452,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);
+ }
/**
* 个人中心-我的惠民卡-查看详情
*/
--
Gitblit v1.7.1