From 8681fee1b92acb6ad2b92aa31eb8d895c7414eac Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 16 四月 2025 15:44:06 +0800
Subject: [PATCH] bug修改
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java | 43 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 38 insertions(+), 5 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..ba0b5ff 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
@@ -1,6 +1,7 @@
package com.dsh.activity.controller;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -132,12 +133,11 @@
case 2:
// 年内卡
Date date1 = new Date();
-
date1.setMonth(11);
date1.setDate(31);
date1.setHours(23);
date1.setMinutes(59);
- date1.setSeconds(59);
+ date1.setSeconds(57);
tPayHuimin.setEndTime(date1);
break;
}
@@ -167,6 +167,7 @@
}
return ResultUtil.success();
}
+
/**
* 查看惠民卡详情
@@ -221,7 +222,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 +283,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 +453,19 @@
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);
+
+ String storeIds = "1001,1002";
+ JSONArray jsonArray = JSONArray.parseArray(Arrays.toString(storeIds.split(",")));
+ System.err.println(jsonArray);
+ }
/**
* 个人中心-我的惠民卡-查看详情
*/
@@ -467,7 +498,9 @@
.map(String::valueOf)
.collect(Collectors.joining(","));
}
- String temp ="{\"siteIds\":\"" +siteIds+"\","+"\"useTimes:\"\""+byId.getUseWeeks()+"\","+"\"unUseTimes:\""+byId.getUnUseTimes()+"\"}";
+ String storeIds = byId.getStoreIds();
+ JSONArray jsonArray = JSONArray.parseArray(Arrays.toString(storeIds.split(",")));
+ String temp ="{\"sid\":\"" +siteIds+"\","+"\"useTimes:\"\""+byId.getUseWeeks()+"\","+"\"unUseTimes:\""+byId.getUnUseTimes()+"\"}";
myHuiminCardDetailVO.setQrCode(temp);
myHuiminCardDetailVO.setCardId(tPayHuimin.getCardId());
myHuiminCardDetailVO.setHuiminCard(byId);
--
Gitblit v1.7.1