From 624c9eec90d59297800f03276f8518daa1bd9f94 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 04 八月 2023 09:23:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 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 1681d5b..c0c704b 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
@@ -147,8 +147,12 @@
@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");
@@ -157,10 +161,7 @@
e.printStackTrace();
}
try {
- Integer userAppId = tokenUtil.getUserIdFormRedis();
- List<UserCoupon> list = ucService.list(new QueryWrapper<UserCoupon>()
- .eq("userId",userAppId ));
- List<Coupon> couponList = couponService.list(new QueryWrapper<Coupon>()
+ couponList = couponService.list(new QueryWrapper<Coupon>()
.eq("auditStatus",2)
.eq("state",1)
.eq("status",2));
--
Gitblit v1.7.1