From 94f34a5cf9ab374afbaefd566bc0a3dc8a4616dd Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 25 十一月 2023 11:14:37 +0800
Subject: [PATCH] 同步
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 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 4adfd22..18f5a97 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
@@ -107,7 +107,9 @@
*/
@ResponseBody
@PostMapping("/coupon/queryCouponByUser/{userId}")
- public List<Integer> queryCouponByUser(@PathVariable("userId") Integer userId){
+ public List<Long> queryCouponByUser(@PathVariable("userId") Integer userId){
+ List<Long> ids = new ArrayList<>();
+ System.err.println("到达了赠送优惠价");
List<Coupon> list = couponService.list(new QueryWrapper<Coupon>().eq("distributionMethod", 2)
.le("startTime", new Date()).ge("endTime", new Date()).eq("auditStatus", 2)
.eq("state", 1));
@@ -135,8 +137,9 @@
userCoupon.setStatus(1);
userCoupon.setInsertTime(new Date());
ucService.save(userCoupon);
+ ids.add(userCoupon.getId());
}
- return null;
+ return ids;
}
@ResponseBody
@@ -305,6 +308,7 @@
@PostMapping("/base/coupon/queryCouponListSearch")
public List<Map<String,Object>> getCouponListOfSearch(@RequestBody CouponListOfSearch ofSearch){
List<Map<String, Object>> mapList1 = couponService.queryCouponListOfSearch(ofSearch);
+
List<Map<String, Object>> mapList = new ArrayList<>();
if (ofSearch.getStoreIds()==null){
ArrayList<Integer> list = new ArrayList<>();
@@ -322,7 +326,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()))
@@ -396,12 +400,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()) {
@@ -646,10 +649,11 @@
if (dataVo.getUserType() == 2){
coupon.setPublisherType(1);
coupon.setAuditStatus(1);
+ coupon.setCityManagerId(dataVo.getCityManagerId());
}
if (dataVo.getUserType() == 3){
coupon.setPublisherType(3);
- coupon.setAuditStatus(2);
+ coupon.setAuditStatus(1);
coupon.setCityManagerId(dataVo.getCityManagerId());
}
--
Gitblit v1.7.1