From 41b60f3df5f3054aad44307c13a26b14f3b32ac0 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期二, 21 十一月 2023 09:46:03 +0800
Subject: [PATCH] 11.21
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java | 5 ++---
1 files changed, 2 insertions(+), 3 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 a16d106..4d0e203 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
@@ -325,7 +325,7 @@
// 获取到优惠券id 查询这个优惠券指定了哪些城市
Integer id = Integer.parseInt(String.valueOf(map.get("id")));
// 获取到运营商管理的省和市
- List<TOperatorCity> cityByOperatorId = operatorClient.getCityByOperatorId(ofSearch.getOperatorId());
+ List<TOperatorCity> cityByOperatorId = ofSearch.getOperatorCities();
// 拿到运营商市的code集合
List<String> collect = cityByOperatorId.stream().filter(t -> t.getPid() != 0)
.map(tOperatorCity -> Integer.toString(tOperatorCity.getCode()))
@@ -399,12 +399,11 @@
@ResponseBody
@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()) {
--
Gitblit v1.7.1