From 276571374e8f0e2be2bdcfc5e8ea4a39af1599bc Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 01 八月 2023 09:42:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java | 151 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 138 insertions(+), 13 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 3156857..8b7b952 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
@@ -1,15 +1,27 @@
package com.dsh.activity.controller;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.activity.entity.Coupon;
+import com.dsh.activity.entity.CouponCity;
+import com.dsh.activity.entity.CouponStore;
import com.dsh.activity.entity.UserCoupon;
+import com.dsh.activity.feignclient.account.CityClient;
+import com.dsh.activity.feignclient.account.StoreStaffClient;
+import com.dsh.activity.feignclient.account.model.TCityManager;
+import com.dsh.activity.feignclient.account.model.TStoreStaff;
import com.dsh.activity.feignclient.model.CouponExamineListSearch;
import com.dsh.activity.feignclient.model.CouponListOfSearch;
+import com.dsh.activity.feignclient.other.StoreClient;
+import com.dsh.activity.feignclient.other.model.Store;
import com.dsh.activity.model.CouponListVo;
import com.dsh.activity.model.request.CommodityRequest;
import com.dsh.activity.model.request.CouponPackageReq;
import com.dsh.activity.model.response.CouponPackageResp;
+import com.dsh.activity.service.CouponCityService;
+import com.dsh.activity.service.CouponStoreService;
import com.dsh.activity.service.ICouponService;
import com.dsh.activity.service.UserCouponService;
import com.dsh.activity.util.GDMapGeocodingUtil;
@@ -22,8 +34,10 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.stream.Collectors;
/**
* @author zhibing.pu
@@ -45,6 +59,21 @@
@Autowired
private GDMapGeocodingUtil gdMapGeocodingUtil;
+ @Resource
+ private CityClient citClient;
+
+ @Resource
+ private StoreStaffClient stoStaClient;
+
+
+ @Resource
+ private StoreClient stoClient;
+
+ @Resource
+ private CouponStoreService couStoreService;
+
+ @Resource
+ private CouponCityService cityService;
@@ -139,8 +168,17 @@
Iterator<Coupon> iterator = couponList.iterator();
while (iterator.hasNext()) {
Coupon merchandise = iterator.next();
- if (merchandise.getUseScope() == 2 && (!Objects.equals(merchandise.getCityCode(), cityCode) && !Objects.equals(merchandise.getProvinceCode(), provinceCode))) {
- iterator.remove(); // 移除符合条件的商品
+ 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;
+ }
+ }
+ }
}
}
}
@@ -192,6 +230,13 @@
Object startTime = stringObjectMap.get("startTime");
Object endTime = stringObjectMap.get("endTime");
stringObjectMap.put("timeValue",startTime + "至"+endTime);
+ Integer publisherType = (Integer) stringObjectMap.get("publisherType");
+ if ( publisherType == 1) {
+ Integer cityManagerId = (Integer) stringObjectMap.get("cityManagerId");
+ TCityManager byId = citClient.getById(cityManagerId);
+ stringObjectMap.put("province", byId.getProvince());
+ stringObjectMap.put("city", byId.getCity());
+ }
}
}
return mapList;
@@ -204,25 +249,105 @@
Coupon coupon = couponService.getById(id);
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
if (ToolUtil.isNotEmpty(coupon)){
- couponInfo.put("",coupon.getId());
- couponInfo.put("",coupon.getName());
- couponInfo.put("",coupon.getAuditStatus());
- couponInfo.put("",coupon.getProvince());
- couponInfo.put("",coupon.getCity());
- couponInfo.put("",coupon.getType());
- couponInfo.put("",coupon.getContent());
- couponInfo.put("",coupon.getIllustrate());
- couponInfo.put("",coupon.getDistributionMethod());
- couponInfo.put("",coupon.getRedemptionMethod());
+ couponInfo.put("id",coupon.getId());
+ couponInfo.put("auditStatus",coupon.getAuditStatus());
+ couponInfo.put("publisherType",coupon.getPublisherType());
+ if (coupon.getPublisherType() == 1){
+ TCityManager byId = citClient.getById(coupon.getCityManagerId());
+ couponInfo.put("province",byId.getProvince());
+ couponInfo.put("city",byId.getCity());
+ }
+ couponInfo.put("name",coupon.getName());
+ couponInfo.put("type",coupon.getType());
+ JSONObject jsonObject = JSON.parseObject(coupon.getContent());
+ switch (coupon.getType()){
+ case 1:
+ couponInfo.put("num1",jsonObject.getDouble("num1"));
+ couponInfo.put("num2",jsonObject.getDouble("num2"));
+ break;
+ case 2:
+ couponInfo.put("num1",jsonObject.getDouble("num1"));
+ break;
+ case 3:
+ couponInfo.put("num1",jsonObject.getString("num1"));
+ break;
+ default:
+ break;
+ }
+ couponInfo.put("illustrate",coupon.getIllustrate());
+ switch (coupon.getDistributionMethod()){
+ case 1:
+ couponInfo.put("distributionMethod","积分注册");
+ break;
+ case 2:
+ couponInfo.put("distributionMethod","注册赠送");
+ break;
+ case 3:
+ couponInfo.put("distributionMethod","自动发券");
+ break;
+ default:
+ break;
+ }
+ couponInfo.put("redemptionMethod",coupon.getRedemptionMethod());
couponInfo.put("integral",coupon.getIntegral());
couponInfo.put("cash",coupon.getCash());
- couponInfo.put("userPopulation",coupon.getUserPopulation());
+ switch (coupon.getUserPopulation()){
+ case 1:
+ couponInfo.put("userPopulation","全部用户");
+ break;
+ case 2:
+ couponInfo.put("userPopulation","年度会员");
+ break;
+ case 3:
+ couponInfo.put("userPopulation","已有学员用户");
+ break;
+ default:
+ break;
+ }
couponInfo.put("quantityIssued",coupon.getQuantityIssued());
couponInfo.put("pickUpQuantity",coupon.getPickUpQuantity());
String startTime = simpleDateFormat.format(coupon.getStartTime());
String endTime = simpleDateFormat.format(coupon.getEndTime());
couponInfo.put("timeValue",startTime + "至"+endTime);
couponInfo.put("useScope",coupon.getUseScope());
+ ArrayList<Map<String, Object>> maps = new ArrayList<>();
+ switch (coupon.getUseScope()){
+ case 2:
+ List<CouponCity> couponCities = cityService.list(new LambdaQueryWrapper<CouponCity>()
+ .eq(CouponCity::getCouponId,coupon.getId()));
+ if (couponCities.size() > 0){
+ for (CouponCity couponCity : couponCities) {
+ HashMap<String, Object> stringObjectHashMap = new HashMap<>();
+ stringObjectHashMap.put("province",couponCity.getProvince());
+ stringObjectHashMap.put("city",couponCity.getCity());
+ maps.add(stringObjectHashMap);
+ }
+ couponInfo.put("rangeData",maps);
+ }
+ break;
+ case 3:
+ List<CouponStore> list = couStoreService.list(new LambdaQueryWrapper<CouponStore>()
+ .eq(CouponStore::getCouponId,coupon.getId()));
+ if (list.size() > 0){
+ List<Integer> collect = list.stream().map(CouponStore::getStoreId).collect(Collectors.toList());
+ List<Store> storeList = stoClient.queryStoreByIds(collect);
+ if (storeList.size() > 0){
+ for (Store store : storeList) {
+ TStoreStaff list1 = stoStaClient.baseInfo(store.getStoreStaffId());
+ HashMap<String, Object> stringObjectHashMap = new HashMap<>();
+ stringObjectHashMap.put("procity",store.getProvince()+store.getCity());
+ stringObjectHashMap.put("storeAccount",list1.getName()+"+"+list1.getPhone());
+ stringObjectHashMap.put("storeName",store.getName());
+ maps.add(stringObjectHashMap);
+ }
+ couponInfo.put("rangeData",maps);
+ }
+
+ }
+ break;
+ default:
+ break;
+ }
}
return couponInfo;
}
--
Gitblit v1.7.1