From e030255c23c7ba3e2cbad1036a810d6d72fa864f Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期四, 26 十月 2023 18:04:58 +0800
Subject: [PATCH] 修改bug
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java | 255 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 200 insertions(+), 55 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 885bba2..f49d537 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
@@ -4,19 +4,24 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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.AppUserClient;
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.RegionClient;
import com.dsh.activity.feignclient.other.StoreClient;
+import com.dsh.activity.feignclient.other.model.CityDataAndProvinceDataVo;
import com.dsh.activity.feignclient.other.model.Store;
import com.dsh.activity.model.CouponListVo;
+import com.dsh.activity.model.CouponRecordQuery;
import com.dsh.activity.model.request.CommodityRequest;
import com.dsh.activity.model.request.CouponDataVo;
import com.dsh.activity.model.request.CouponPackageReq;
@@ -29,6 +34,7 @@
import com.dsh.activity.util.ResultUtil;
import com.dsh.activity.util.TokenUtil;
import com.dsh.activity.util.ToolUtil;
+import com.google.gson.Gson;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
@@ -38,6 +44,7 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
@@ -71,11 +78,18 @@
@Resource
private StoreClient stoClient;
+
+ @Resource
+ private RegionClient regionClient;
+
@Resource
private CouponStoreService couStoreService;
@Resource
private CouponCityService cityService;
+
+ @Autowired
+ private AppUserClient appUserClient;
@@ -150,41 +164,45 @@
@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;
- }
+// 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 {
- 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();
+
couponList = couponService.list(new QueryWrapper<Coupon>()
- .eq("auditStatus",2)
+ .eq("distributionMethod",1)
.eq("state",1)
- .eq("status",2));
- 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;
- }
- }
- }
- }
- }
- }
+ .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;
+// }
+// }
+// }
+// }
+// }
+// }
return couponList;
} catch (Exception e) {
throw new RuntimeException(e);
@@ -201,6 +219,7 @@
@PostMapping("/base/coupon/insertToAppuserCoupon")
public void insertToAppuserCoupon(@RequestBody UserCoupon coupon){
+ coupon.setInsertTime(new Date());
ucService.save(coupon);
}
@@ -209,7 +228,28 @@
@ResponseBody
@PostMapping("/base/coupon/queryCouponListSearch")
public List<Map<String,Object>> getCouponListOfSearch(@RequestBody CouponListOfSearch ofSearch){
- List<Map<String, Object>> mapList = couponService.queryCouponListOfSearch(ofSearch);
+ List<Map<String, Object>> mapList1 = couponService.queryCouponListOfSearch(ofSearch);
+ List<Map<String, Object>> mapList = new ArrayList<>();
+
+ if(ofSearch.getStoreId()!=null){
+ for (Map<String, Object> map : mapList1) {
+ List<CouponStore> id = couStoreService.list(new LambdaQueryWrapper<CouponStore>().eq(CouponStore::getCouponId, map.get("id").toString()));
+ List<Integer> collect = id.stream().map(CouponStore::getStoreId).collect(Collectors.toList());
+ if(collect.size()==0){
+ collect.add(-1);
+ }
+ if(collect.contains(ofSearch.getStoreId())){
+ if(collect.size()>1){
+ map.put("size",1);
+ }else {
+ map.put("size",0);
+ }
+ mapList.add(map);
+ }
+ }
+ }else {
+ mapList = mapList1;
+ }
if (mapList.size() > 0){
for (Map<String, Object> stringObjectMap : mapList) {
Integer o = (Integer) stringObjectMap.get("id");
@@ -224,6 +264,24 @@
return mapList;
}
+
+ @ResponseBody
+ @PostMapping("/base/coupon/queryCouponListSearch1")
+ public List<Map<String,Object>> getCouponListOfSearch1(@RequestBody CouponListOfSearch ofSearch){
+ List<Map<String, Object>> mapList = couponService.queryCouponListOfSearch1(ofSearch);
+ if (mapList.size() > 0){
+ for (Map<String, Object> stringObjectMap : mapList) {
+ Integer o = (Integer) stringObjectMap.get("id");
+ Object startTime = stringObjectMap.get("startTime");
+ Object endTime = stringObjectMap.get("endTime");
+ stringObjectMap.put("timeValue",startTime + "至"+endTime);
+ int count = ucService.count(new LambdaQueryWrapper<UserCoupon>()
+ .eq(UserCoupon::getCouponId, o));
+ stringObjectMap.put("hasPickQty",count);
+ }
+ }
+ return mapList;
+ }
@ResponseBody
@PostMapping("/base/coupon/couponExamineListSearch")
public List<Map<String,Object>> getCouponExamineListOfSearch(@RequestBody CouponExamineListSearch ofSearch){
@@ -234,11 +292,14 @@
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());
+ if (publisherType!=null) {
+ if (publisherType == 1) {
+ Integer cityManagerId = (Integer) stringObjectMap.get("cityManagerId");
+ TCityManager byId = citClient.getById(cityManagerId);
+ stringObjectMap.put("province", byId.getProvince());
+
+ stringObjectMap.put("city", byId.getCity());
+ }
}
}
}
@@ -372,26 +433,28 @@
@ResponseBody
@PostMapping("/base/coupon/insertIntoCouponData")
public boolean saveCouponData(@RequestBody CouponDataVo dataVo){
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
try {
System.out.println(dataVo);
Coupon coupon = new Coupon();
coupon.setName(dataVo.getCouponName());
coupon.setType(dataVo.getPrescription());
HashMap<String, Object> stringObjectHashMap = new HashMap<>();
+ Gson gson = new Gson();
switch (dataVo.getPrescription()){
// {"conditionalAmount":50,"deductionAmount":10,"experienceName":""}
case 1:
stringObjectHashMap.put("conditionalAmount",dataVo.getCondition());
stringObjectHashMap.put("deductionAmount",dataVo.getSubtraction());
- coupon.setContent(stringObjectHashMap.toString());
+ coupon.setContent(gson.toJson(stringObjectHashMap));
break;
case 2:
stringObjectHashMap.put("conditionalAmount",dataVo.getDiscount());
- coupon.setContent(stringObjectHashMap.toString());
+ coupon.setContent(gson.toJson(stringObjectHashMap));
break;
case 3:
stringObjectHashMap.put("experienceName",dataVo.getExperience());
- coupon.setContent(stringObjectHashMap.toString());
+ coupon.setContent(gson.toJson(stringObjectHashMap));
break;
default:
break;
@@ -399,36 +462,118 @@
coupon.setIllustrate(dataVo.getIllustrate());
coupon.setDistributionMethod(dataVo.getDistributionMethod());
coupon.setRedemptionMethod(dataVo.getExchangeMethod());
- coupon.setCash(dataVo.getRequiredCash());
- coupon.setIntegral(BigDecimal.valueOf(dataVo.getRequiredPoints()));
+ switch (dataVo.getExchangeMethod()){
+ case 1:
+ coupon.setIntegral(BigDecimal.valueOf(dataVo.getRequiredPoints()));
+ break;
+ case 2:
+ coupon.setCash(dataVo.getRequiredCash());
+ coupon.setIntegral(BigDecimal.valueOf(dataVo.getRequiredPoints()));
+ break;
+ case 3:
+ coupon.setCash(dataVo.getRequiredCash());
+ break;
+ default:
+ break;
+ }
coupon.setQuantityIssued(dataVo.getQuantityIssued());
coupon.setPickUpQuantity(dataVo.getPickUpQuantity());
coupon.setUseScope(dataVo.getCompany());
+ coupon.setUserPopulation(dataVo.getUserGroup());
+ String timeDeal = dataVo.getPeriodOfValidity();
+ if (ToolUtil.isNotEmpty(timeDeal)){
+ String[] split = timeDeal.split(" - ");
+ coupon.setStartTime(simpleDateFormat.parse(split[0]));
+ coupon.setEndTime(simpleDateFormat.parse(split[1]));
+ }
coupon.setAuditStatus(1);
coupon.setStatus(1);
+ coupon.setState(1);
coupon.setInsertTime(new Date());
coupon.setCover(dataVo.getGoodImg());
- List<String> goodImgs = dataVo.getGoodImgs();
- StringBuilder builder = new StringBuilder();
- if (goodImgs.size() > 0){
- if (goodImgs.size() == 1){
- coupon.setProductImages(goodImgs.get(0));
+ String goodImgs = dataVo.getGoodImgs();
+ String[] imgsSplit = goodImgs.split(",");
+ if (imgsSplit.length > 0){
+ if (imgsSplit.length == 1){
+ coupon.setProductImages(imgsSplit[0]);
}else {
- for (String goodImg : goodImgs) {
- builder.append(goodImg).append(",");
- }
- builder.deleteCharAt(builder.lastIndexOf(","));
- coupon.setProductImages(builder.toString());
+ coupon.setProductImages(goodImgs);
}
}
- coupon.setPublisherType(dataVo.getUserType());
if (dataVo.getUserType() == 1){
+ coupon.setPublisherType(2);
+ }
+ if (dataVo.getUserType() == 2){
+ coupon.setPublisherType(1);
coupon.setCityManagerId(dataVo.getCityManagerId());
}
- return couponService.save(coupon);
+ if(dataVo.getObjType()!=1){
+ coupon.setAuditStatus(1);
+ }
+
+ boolean save = couponService.save(coupon);
+ if (save){
+ if (dataVo.getCompany() == 3){
+ String[] split = dataVo.getStoreIds().split(",");
+ for (String storeId : split) {
+ CouponStore couponStore = new CouponStore();
+ couponStore.setCouponId(coupon.getId());
+ couponStore.setStoreId(Integer.parseInt(storeId));
+ couStoreService.save(couponStore);
+ }
+ }
+ String cityIds = dataVo.getCityIds();
+ String[] split = cityIds.split(",");
+ List<Integer> cityIdss = new ArrayList<>();
+ if (dataVo.getCompany() == 2 && split.length > 0 ){
+ for (String s : split) {
+ int intValue = Integer.parseInt(s);
+ cityIdss.add(intValue);
+ }
+ List<CityDataAndProvinceDataVo> cityAndProvince = regionClient.getCityAndProvince(cityIdss);
+ for (CityDataAndProvinceDataVo cityId : cityAndProvince) {
+ CouponCity couponCity = new CouponCity();
+ couponCity.setCouponId(coupon.getId());
+ couponCity.setCityCode(cityId.getCityCode());
+ couponCity.setCity(cityId.getCityName());
+ couponCity.setProvinceCode(cityId.getProvinceCode());
+ couponCity.setProvince(cityId.getProvinceName());
+ System.out.println(couponCity);
+ cityService.save(couponCity);
+ }
+ }
+ }
+ return true;
}catch (Exception e){
return false;
}
}
+ @ResponseBody
+ @PostMapping("/base/coupon/queryCity")
+ public List<CouponCity> queryCity(@RequestBody Integer id){
+ List<CouponCity> list = cityService.list(new LambdaQueryWrapper<CouponCity>().eq(CouponCity::getCouponId, id));
+ return list;
+ }
+
+ @ResponseBody
+ @PostMapping("/base/coupon/queryStore")
+ public List<Integer> queryStore(@RequestBody Integer id){
+ return couStoreService.list(new LambdaQueryWrapper<CouponStore>().eq(CouponStore::getCouponId,id)).stream().map(CouponStore::getStoreId).collect(Collectors.toList());
+ }
+
+
+ @PostMapping("/base/coupon/listRecord")
+ @ResponseBody
+ public List<Map<String,Object>> listRecord(@RequestBody CouponRecordQuery ofSearch){
+ Page<Object> objectPage = new Page<>(ofSearch.getOffset(), ofSearch.getLimit());
+ return couponService.listRecord(objectPage,ofSearch.getId(),ofSearch.getIds(),ofSearch.getType());
+ }
+
+
+
+ @PostMapping("/base/coupon/updateType")
+ public void updateType(@RequestBody Long id){
+ couponService.updateType(id);
+ }
}
--
Gitblit v1.7.1