From 1a3801b7316b0a23b6d3924eb4fbb023b1edef83 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 07 十一月 2023 10:30:14 +0800
Subject: [PATCH] 后台bug修改
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java | 77 +++++++++++++++++++++++---------------
1 files changed, 46 insertions(+), 31 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 f531216..7b459a7 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
@@ -100,7 +100,7 @@
@ResponseBody
@PostMapping("/coupon/queryCouponByUser/{userId}")
public List<Integer> queryCouponByUser(@PathVariable("userId") Integer userId){
- List<Coupon> list = couponService.list(new QueryWrapper<Coupon>().eq("distributionMethod", 2)
+ List<Coupon> list = couponService.list(new QueryWrapper<Coupon>().eq("distributionMethod", 2).eq("userPopulation",2)
.le("startTime", new Date()).ge("endTime", new Date()).eq("auditStatus", 2)
.eq("state", 1));
@@ -202,18 +202,18 @@
@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");
-// cityCode = geocode.get("cityCode");
-// }catch (Exception e){
-// e.printStackTrace();
-// }
+ 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");
+ cityCode = geocode.get("cityCode");
+ }catch (Exception e){
+ e.printStackTrace();
+ }
try {
LocalDateTime currentDate = LocalDateTime.now();
@@ -223,24 +223,24 @@
.eq("status",1)
.le("startTime", currentDate)
.ge("endTime", currentDate));
-// if (couponList.size() > 0 ){
-// Iterator<Coupon> iterator = couponList.iterator();
-// while (iterator.hasNext()) {
-// Coupon merchandise = iterator.next();
-// if (merchandise.getUseScope() == 2){
-// List<CouponCity> couponCities = cityService.list(new LambdaQueryWrapper<CouponCity>()
-// .eq(CouponCity::getCouponId,merchandise.getId()));
-// if (couponCities.size() > 0){
-// for (CouponCity couponCity : couponCities) {
-// if (!Objects.equals(couponCity.getCityCode(), cityCode) && !Objects.equals(couponCity.getProvinceCode(), provinceCode)){
-// iterator.remove(); // 移除符合条件的商品
-// break;
-// }
-// }
-// }
-// }
-// }
-// }
+ if (couponList.size() > 0 ){
+ Iterator<Coupon> iterator = couponList.iterator();
+ while (iterator.hasNext()) {
+ Coupon merchandise = iterator.next();
+ if (merchandise.getUseScope() == 2){
+ List<CouponCity> couponCities = cityService.list(new LambdaQueryWrapper<CouponCity>()
+ .eq(CouponCity::getCouponId,merchandise.getId()));
+ if (couponCities.size() > 0){
+ for (CouponCity couponCity : couponCities) {
+ if (!Objects.equals(couponCity.getCityCode(), cityCode) && !Objects.equals(couponCity.getProvinceCode(), provinceCode)){
+ iterator.remove(); // 移除符合条件的商品
+ break;
+ }
+ }
+ }
+ }
+ }
+ }
return couponList;
} catch (Exception e) {
throw new RuntimeException(e);
@@ -627,6 +627,21 @@
}
boolean save = couponService.save(coupon);
+ // 自动发券
+ if (dataVo.getDistributionMethod() == 3){
+ // 判断用户人群 再判断限领数量
+ switch (dataVo.getUserGroup()){
+ case 1:
+
+ break;
+ case 2:
+
+ break;
+ case 3:
+
+ break;
+ }
+ }
if (save){
if (dataVo.getCompany() == 3){
String[] split = dataVo.getStoreIds().split(",");
--
Gitblit v1.7.1