From efd48fe10bde8a50106aedf60ea6dc7f1e74e264 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 10 十二月 2025 14:26:15 +0800
Subject: [PATCH] bug修改
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 59 +++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 45 insertions(+), 14 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
index f2a8644..9cf424c 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
@@ -398,7 +398,7 @@
@PostMapping("/base/pointMerchars/getCommoditys")
public PointMerchandiseVo getVicinityGoods(@RequestBody CommodityRequest request) {
-
+ System.err.println("积分商城请求参数"+request);
PointMerchandiseVo pointMerchandiseVo = new PointMerchandiseVo();
List<PointsMerchandise> list = new ArrayList<>();
String provinceCode = "";
@@ -436,13 +436,15 @@
pointMerchandiseVo.setMerchandises(list);
return pointMerchandiseVo;
}else{
- List<PointsMerchandise> pointsMerchandiseList = pmdsService.lambdaQuery().in(PointsMerchandise::getId, pointsMerchandiseIds).list();
- list.addAll(pointsMerchandiseList);
- List<PointsMerchandise> listAll = list.stream().distinct().collect(Collectors.toList());
- list = listAll;
+ List<PointsMerchandise> pointsMerchandiseList = pmdsService.lambdaQuery()
+ .eq(PointsMerchandise::getState, 1)
+ .eq(PointsMerchandise::getShelves,1)
+ .in(PointsMerchandise::getId, pointsMerchandiseIds).list();
+
+ list = pointsMerchandiseList;
}
}
-
+ list = list.stream().distinct().collect(Collectors.toList());
if (list.size() > 0) {
Iterator<PointsMerchandise> iterator = list.iterator();
while (iterator.hasNext()) {
@@ -910,7 +912,7 @@
detailsResponse.setGoodType(merchandise.getType());
if (merchandise.getType() == 3) {
detailsResponse.setCodeType(3);
- detailsResponse.setDataId(pointsMerchandise.getPointsMerchandiseId());
+ detailsResponse.setDataId(pointsMerchandise.getId()+"");
detailsResponse.setCardType(merchandise.getCardType());
List<Integer> sids = new ArrayList<>();
detailsResponse.setUserId(appUserId);
@@ -1031,7 +1033,7 @@
String format = simpleDateFormat1.format(pointsMerchandise.getInsertTime());
detailsResponse.setStartTime(format + " " + startTime + ":00");
detailsResponse.setEndTime(format + " " + endTime + ":00");
- if (simpleDateFormat.parse(format + " " + endTime + ":00").before(new Date())) {
+ if (simpleDateFormat.parse(format + " " + endTime + ":00").before(new Date()) &&detailsResponse.getUseStatus()==2) {
System.err.println("过期了，当前门店中最晚营业时间为" + format + " " + endTime + ":00");
detailsResponse.setUseStatus(3);
}
@@ -1047,15 +1049,22 @@
detailsResponse.setEndTime(endDate);
Date now = new Date();
- if (now.after(end)) {
+ if (now.after(end)&&detailsResponse.getUseStatus()==2) {
detailsResponse.setUseStatus(3);
}
+// if (detailsResponse.getUseStatus()!=3){
+// if (detailsResponse.getUseStatus()==1 &&now.after(end)){
+// detailsResponse.setUseStatus(2);
+// }else{
+// detailsResponse.setUseStatus(2);
+// }
+// }
} else if (merchandise.getCardType() == 3) {
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Calendar calendar = Calendar.getInstance();
calendar.setTime(pointsMerchandise.getInsertTime());
- calendar.add(Calendar.DAY_OF_MONTH, 93);
+ calendar.add(Calendar.DAY_OF_MONTH, 90);
Date end = calendar.getTime();
String startDate = dateFormat.format(pointsMerchandise.getInsertTime());
String endDate = dateFormat.format(end);
@@ -1063,15 +1072,22 @@
detailsResponse.setEndTime(endDate);
Date now = new Date();
- if (now.after(end)) {
+ if (now.after(end)&&detailsResponse.getUseStatus()==2) {
detailsResponse.setUseStatus(3);
}
+// if (detailsResponse.getUseStatus()!=3){
+// if (detailsResponse.getUseStatus()==1 &&now.after(end)){
+// detailsResponse.setUseStatus(2);
+// }else{
+// detailsResponse.setUseStatus(2);
+// }
+// }
} else if (merchandise.getCardType() == 4) {
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Calendar calendar = Calendar.getInstance();
calendar.setTime(pointsMerchandise.getInsertTime());
- calendar.add(Calendar.DAY_OF_MONTH, 372);
+ calendar.add(Calendar.DAY_OF_MONTH, 365);
Date end = calendar.getTime();
String startDate = dateFormat.format(pointsMerchandise.getInsertTime());
String endDate = dateFormat.format(end);
@@ -1079,9 +1095,16 @@
detailsResponse.setEndTime(endDate);
Date now = new Date();
- if (now.after(end)) {
+ if (now.after(end)&&detailsResponse.getUseStatus()==2) {
detailsResponse.setUseStatus(3);
}
+// if (detailsResponse.getUseStatus()!=3){
+// if (detailsResponse.getUseStatus()==1 &&now.after(end)){
+// detailsResponse.setUseStatus(2);
+// }else{
+// detailsResponse.setUseStatus(2);
+// }
+// }
}
@@ -1105,12 +1128,16 @@
detailsResponse.setUseStatus(vipDetail.getStatus() == 1 ? 2 : 1);
detailsResponse.setGoodType(3);
detailsResponse.setCardType(3);
+ detailsResponse.setDataId(vipDetail.getId()+"");
// 表明是会员赠送的门票
detailsResponse.setExchangeType(4);
// 全国通用
detailsResponse.setRid(Collections.singletonList(0));
detailsResponse.setSid(Collections.singletonList(0));
-
+ Date now = new Date();
+ if (now.after(vipDetail.getEndTime())&&detailsResponse.getUseStatus()==2) {
+ detailsResponse.setUseStatus(3);
+ }
responses.add(detailsResponse);
}
if (userCoupons.size() > 0) {
@@ -1139,6 +1166,10 @@
detailsResponse.setEndTime(simpleDateFormat.format(c.getEndTime()));
detailsResponse.setUseStatus(userCoupon.getStatus() == 1 ? 2 : 1);
detailsResponse.setGoodType(4);
+ Date now = new Date();
+ if (now.after(c.getEndTime())&&detailsResponse.getUseStatus()==2) {
+ detailsResponse.setUseStatus(3);
+ }
responses.add(detailsResponse);
}
Comparator<ExchangeDetailsResponse> comparator = Comparator.comparing(ExchangeDetailsResponse::getStartTime).reversed();
--
Gitblit v1.7.1