From a5fa1ac5cdcb1b436a96af8344a3a7bf5f83391d Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期五, 27 十月 2023 16:12:57 +0800
Subject: [PATCH] 10.27.3
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+), 0 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java
index d001de6..4a16c13 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java
@@ -239,6 +239,11 @@
collect.add(-1);
}
if(collect.contains(ofSearch.getStoreId())){
+ if(collect.size()>1){
+ map.put("size",1);
+ }else {
+ map.put("size",0);
+ }
mapList.add(map);
}
}
@@ -264,6 +269,22 @@
@PostMapping("/base/coupon/queryCouponListSearch1")
public List<Map<String,Object>> getCouponListOfSearch1(@RequestBody CouponListOfSearch ofSearch){
List<Map<String, Object>> mapList = couponService.queryCouponListOfSearch1(ofSearch);
+
+ Date currentDate = new Date();
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ String currentDateStr = sdf.format(currentDate);
+
+ // Iterate over the mapList and remove entries where endTime is less than the current date
+ Iterator<Map<String, Object>> iterator = mapList.iterator();
+ while (iterator.hasNext()) {
+ Map<String, Object> map = iterator.next();
+ String endTime = (String) map.get("endTime");
+ if (endTime.compareTo(currentDateStr) < 0) {
+ iterator.remove();
+ }
+ }
+
+
if (mapList.size() > 0){
for (Map<String, Object> stringObjectMap : mapList) {
Integer o = (Integer) stringObjectMap.get("id");
@@ -502,6 +523,18 @@
coupon.setPublisherType(1);
coupon.setCityManagerId(dataVo.getCityManagerId());
}
+ if(dataVo.getObjType()!=1){
+ coupon.setAuditStatus(1);
+ }
+ if (dataVo.getUserType()==1){
+ coupon.setAuditStatus(2);
+ }else{
+ coupon.setAuditStatus(1);
+ }
+ if(dataVo.getObjType()!=1){
+ coupon.setAuditStatus(1);
+ }
+
boolean save = couponService.save(coupon);
if (save){
if (dataVo.getCompany() == 3){
--
Gitblit v1.7.1