From a992ef30f108338b5318c31aaf49aeb98d9da77e Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 24 十月 2023 20:22:32 +0800
Subject: [PATCH] 运营商权限
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java | 89 ++++++++++++++++++++++++++++----------------
1 files changed, 56 insertions(+), 33 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..208e0cb 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
@@ -44,6 +44,7 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
@@ -163,41 +164,45 @@
@PostMapping("/base/coupon/getAllCoupons")
public List<Coupon> getAllCoupons(@RequestBody CommodityRequest request){
List<Coupon> couponList = new ArrayList<>();
- String provinceCode = "";
- String cityCode = "";
- if (ToolUtil.isEmpty(request.getLat()) && ToolUtil.isEmpty(request.getLon())){
- return couponList;
- }
+// String provinceCode = "";
+// String cityCode = "";
+// if (ToolUtil.isEmpty(request.getLat()) && ToolUtil.isEmpty(request.getLon())){
+// return couponList;
+// }
+// try {
+// Map<String, String> geocode = gdMapGeocodingUtil.geocode(request.getLon(), request.getLat());
+// provinceCode = geocode.get("provinceCode");
+// cityCode = geocode.get("cityCode");
+// }catch (Exception e){
+// e.printStackTrace();
+// }
try {
- Map<String, String> geocode = gdMapGeocodingUtil.geocode(request.getLon(), request.getLat());
- provinceCode = geocode.get("provinceCode");
- cityCode = geocode.get("cityCode");
- }catch (Exception e){
- e.printStackTrace();
- }
- try {
+ LocalDateTime currentDate = LocalDateTime.now();
+
couponList = couponService.list(new QueryWrapper<Coupon>()
- .eq("auditStatus",2)
+ .eq("distributionMethod",1)
.eq("state",1)
- .eq("status",2));
- if (couponList.size() > 0 ){
- Iterator<Coupon> iterator = couponList.iterator();
- while (iterator.hasNext()) {
- Coupon merchandise = iterator.next();
- if (merchandise.getUseScope() == 2){
- List<CouponCity> couponCities = cityService.list(new LambdaQueryWrapper<CouponCity>()
- .eq(CouponCity::getCouponId,merchandise.getId()));
- if (couponCities.size() > 0){
- for (CouponCity couponCity : couponCities) {
- if (!Objects.equals(couponCity.getCityCode(), cityCode) && !Objects.equals(couponCity.getProvinceCode(), provinceCode)){
- iterator.remove(); // 移除符合条件的商品
- break;
- }
- }
- }
- }
- }
- }
+ .eq("status",1)
+ .le("startTime", currentDate)
+ .ge("endTime", currentDate));
+// if (couponList.size() > 0 ){
+// Iterator<Coupon> iterator = couponList.iterator();
+// while (iterator.hasNext()) {
+// Coupon merchandise = iterator.next();
+// if (merchandise.getUseScope() == 2){
+// List<CouponCity> couponCities = cityService.list(new LambdaQueryWrapper<CouponCity>()
+// .eq(CouponCity::getCouponId,merchandise.getId()));
+// if (couponCities.size() > 0){
+// for (CouponCity couponCity : couponCities) {
+// if (!Objects.equals(couponCity.getCityCode(), cityCode) && !Objects.equals(couponCity.getProvinceCode(), provinceCode)){
+// iterator.remove(); // 移除符合条件的商品
+// break;
+// }
+// }
+// }
+// }
+// }
+// }
return couponList;
} catch (Exception e) {
throw new RuntimeException(e);
@@ -238,6 +243,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 +464,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