From 39518349b9b4b2e2fd0bf153623c8d88301c539e Mon Sep 17 00:00:00 2001
From: lisy <linlangsur163@163.com>
Date: 星期四, 03 八月 2023 21:35:53 +0800
Subject: [PATCH] 修复了开始上课的冗余勋章列表查询bug
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
index 8c2e9aa..cb9957e 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
@@ -18,10 +18,7 @@
import com.dsh.activity.util.TokenUtil;
import com.dsh.activity.util.ToolUtil;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
@@ -70,12 +67,13 @@
private CouponCityService ccityService;
+ @ResponseBody
@PostMapping("/base/pointMerchars/convertGoods")
public List<IntegralCommodity> getConvertibleGoods(){
List<IntegralCommodity> commodity = new ArrayList<>();
List<PointsMerchandise> merchandises = pmdsService.list(new QueryWrapper<PointsMerchandise>()
.eq("state",1)
- .lt("endTime",new Date()));
+ .gt("endTime",new Date()));
if (merchandises.size() > 0){
for (PointsMerchandise merchandise : merchandises) {
IntegralCommodity integralCommodity = new IntegralCommodity();
@@ -83,17 +81,23 @@
integralCommodity.setCommodityImg(merchandise.getProductImages());
integralCommodity.setCommodityName(merchandise.getName());
integralCommodity.setCommodityPrice(merchandise.getPrice());
+ integralCommodity.setGoodsType(merchandise.getType());
commodity.add(integralCommodity);
}
}
+ System.out.println(commodity);
return commodity;
}
@PostMapping("/base/pointMerchars/getCommoditys")
public List<PointsMerchandise> getVicinityGoods(@RequestBody CommodityRequest request){
+ List<PointsMerchandise> list = new ArrayList<>();
String provinceCode = "";
String cityCode = "";
+ if (ToolUtil.isEmpty(request.getLon()) && ToolUtil.isEmpty(request.getLat())){
+ return list;
+ }
try {
Map<String, String> geocode = gdMapGeocodingUtil.geocode(request.getLon(), request.getLat());
provinceCode = geocode.get("provinceCode");
@@ -102,7 +106,7 @@
e.printStackTrace();
}
- List<PointsMerchandise> list = pmdsService.list(new QueryWrapper<PointsMerchandise>()
+ list = pmdsService.list(new QueryWrapper<PointsMerchandise>()
.eq("state", 1));
if (list.size() > 0 ){
Iterator<PointsMerchandise> iterator = list.iterator();
--
Gitblit v1.7.1