From 134d13688e4b6677133ba2d362d2978d8bda2b87 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 12 七月 2023 11:46:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 48 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 45 insertions(+), 3 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 9e61d1e..e326ec9 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
@@ -3,16 +3,19 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.activity.entity.PointsMerchandise;
+import com.dsh.activity.entity.UserPointsMerchandise;
import com.dsh.activity.feignclient.model.IntegralCommodity;
+import com.dsh.activity.model.request.CommodityRequest;
import com.dsh.activity.service.PointsMerchandiseService;
+import com.dsh.activity.service.UserPointsMerchandiseService;
+import com.dsh.activity.util.GDMapGeocodingUtil;
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 java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
@RestController
@RequestMapping("")
@@ -21,6 +24,12 @@
@Autowired
private PointsMerchandiseService pmdsService;
+
+ @Autowired
+ private GDMapGeocodingUtil gdMapGeocodingUtil;
+
+ @Autowired
+ private UserPointsMerchandiseService upmseService;
@@ -43,4 +52,37 @@
return commodity;
}
+
+ @PostMapping("/base/pointMerchars/getCommoditys")
+ public List<PointsMerchandise> getVicinityGoods(@RequestBody CommodityRequest request){
+ String provinceCode = "";
+ String cityCode = "";
+ try {
+ Map<String, String> geocode = gdMapGeocodingUtil.geocode(request.getLon(), request.getLat());
+ provinceCode = geocode.get("provinceCode");
+ cityCode = geocode.get("cityCode");
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+
+ List<PointsMerchandise> list = pmdsService.list(new QueryWrapper<PointsMerchandise>()
+ .eq("state", 1));
+ if (list.size() > 0 ){
+ Iterator<PointsMerchandise> iterator = list.iterator();
+ while (iterator.hasNext()) {
+ PointsMerchandise merchandise = iterator.next();
+ if (merchandise.getUseScope() == 2 && (!Objects.equals(merchandise.getCityCode(), cityCode) && !Objects.equals(merchandise.getProvinceCode(), provinceCode))) {
+ iterator.remove(); // 移除符合条件的商品
+ }
+ }
+ }
+ return list;
+ }
+
+ @PostMapping("/base/pointMerchars/getRedeemedNums")
+ public int getRedeemedQuantity(@RequestBody Integer goodId){
+ return upmseService.count(new QueryWrapper<UserPointsMerchandise>()
+ .eq("pointsMerchandiseId",goodId));
+ }
+
}
--
Gitblit v1.7.1