From 6a8b55a2183720ff6106f581695298168896cadc Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 11 十月 2023 16:03:26 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 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 3228d61..e9a3473 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
@@ -238,6 +238,24 @@
return mapList;
}
+
+ @ResponseBody
+ @PostMapping("/base/coupon/queryCouponListSearch1")
+ public List<Map<String,Object>> getCouponListOfSearch1(@RequestBody CouponListOfSearch ofSearch){
+ List<Map<String, Object>> mapList = couponService.queryCouponListOfSearch1(ofSearch);
+ if (mapList.size() > 0){
+ for (Map<String, Object> stringObjectMap : mapList) {
+ Integer o = (Integer) stringObjectMap.get("id");
+ Object startTime = stringObjectMap.get("startTime");
+ Object endTime = stringObjectMap.get("endTime");
+ stringObjectMap.put("timeValue",startTime + "至"+endTime);
+ int count = ucService.count(new LambdaQueryWrapper<UserCoupon>()
+ .eq(UserCoupon::getCouponId, o));
+ stringObjectMap.put("hasPickQty",count);
+ }
+ }
+ return mapList;
+ }
@ResponseBody
@PostMapping("/base/coupon/couponExamineListSearch")
public List<Map<String,Object>> getCouponExamineListOfSearch(@RequestBody CouponExamineListSearch ofSearch){
@@ -441,7 +459,7 @@
}
coupon.setAuditStatus(1);
coupon.setStatus(1);
- coupon.setState(2);
+ coupon.setState(1);
coupon.setInsertTime(new Date());
coupon.setCover(dataVo.getGoodImg());
String goodImgs = dataVo.getGoodImgs();
--
Gitblit v1.7.1