From e900ccb94046eabeff772f51c9492c3d8cfa2941 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 18 八月 2025 10:40:58 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 59 insertions(+), 0 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 606f194..c770baa 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
@@ -189,6 +189,31 @@
return null;
}
}
+
+ @ResponseBody
+ @PostMapping("/coupon/queryCouponAll")
+ public List<Coupon> queryCouponAll() {
+ try {
+
+ return couponService.lambdaQuery().eq(Coupon::getState,1)
+ .eq(Coupon::getAuditStatus,2).list();
+ } catch (Exception e) {
+ e.printStackTrace();
+ return null;
+ }
+ }
+ @ResponseBody
+ @PostMapping("/coupon/queryCouponList")
+ public List<Coupon> queryCouponList() {
+ try {
+
+ return couponService.lambdaQuery().ne(Coupon::getState,3)
+ .eq(Coupon::getAuditStatus,2).list();
+ } catch (Exception e) {
+ e.printStackTrace();
+ return null;
+ }
+ }
@ResponseBody
@PostMapping("/coupon/queryUserCouponById")
public Integer queryUserCouponById(@RequestBody Long id) {
@@ -420,6 +445,26 @@
}
return mapList;
}
+ @ResponseBody
+ @PostMapping("/base/coupon/getCouponListAllOfSearch")
+ public List<Map<String, Object>> getCouponListAllOfSearch(@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<>();
+ ofSearch.setStoreIds(list);
+ }
+ mapList = mapList1;
+ if (mapList.size() > 0) {
+ for (Map<String, Object> stringObjectMap : mapList) {
+ Object startTime = stringObjectMap.get("startTime");
+ Object endTime = stringObjectMap.get("endTime");
+ stringObjectMap.put("timeValue", startTime + "至" + endTime);
+ }
+ }
+ return mapList;
+ }
@ResponseBody
@@ -622,6 +667,9 @@
stringObjectHashMap.put("experienceName", dataVo.getExperience());
coupon.setContent(gson.toJson(stringObjectHashMap));
break;
+ case 4:
+ coupon.setGoodsId(dataVo.getGoodsId());
+ break;
default:
break;
}
@@ -796,12 +844,23 @@
List<CouponCity> list = cityService.list(new LambdaQueryWrapper<CouponCity>().eq(CouponCity::getCouponId, id));
return list;
}
+ @ResponseBody
+ @PostMapping("/base/coupon/queryAllCity")
+ public List<CouponCity> queryAllCity() {
+ List<CouponCity> list = cityService.list(new LambdaQueryWrapper<CouponCity>());
+ return list;
+ }
@ResponseBody
@PostMapping("/base/coupon/queryStore")
public List<Integer> queryStore(@RequestBody Integer id) {
return couStoreService.list(new LambdaQueryWrapper<CouponStore>().eq(CouponStore::getCouponId, id)).stream().map(CouponStore::getStoreId).collect(Collectors.toList());
}
+ @ResponseBody
+ @PostMapping("/base/coupon/queryAllStore")
+ public List<CouponStore> queryAllStore() {
+ return couStoreService.list(new LambdaQueryWrapper<CouponStore>());
+ }
@PostMapping("/base/coupon/listRecord")
--
Gitblit v1.7.1