From 6af0c7434178ca41e727c700af8174201a865de9 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期四, 02 十一月 2023 11:55:29 +0800
Subject: [PATCH] 10.31.8
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java | 60 ++++++++++++++++++++++++++++++------------------------------
1 files changed, 30 insertions(+), 30 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 d9bac30..63da441 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
@@ -199,18 +199,18 @@
@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;
-// }
-// try {
-// Map<String, String> geocode = gdMapGeocodingUtil.geocode(request.getLon(), request.getLat());
-// provinceCode = geocode.get("provinceCode");
-// cityCode = geocode.get("cityCode");
-// }catch (Exception e){
-// e.printStackTrace();
-// }
+ 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 {
LocalDateTime currentDate = LocalDateTime.now();
@@ -220,24 +220,24 @@
.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;
-// }
-// }
-// }
-// }
-// }
-// }
+ 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);
--
Gitblit v1.7.1