From b27efc697f2f81e0d0f247a2708e58af52a5df9b Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 23 十月 2025 15:14:33 +0800
Subject: [PATCH] bug修改,后台新增修改用户积分
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/UserCouponController.java | 300 +++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 249 insertions(+), 51 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/UserCouponController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/UserCouponController.java
index da55753..6d2402f 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/UserCouponController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/UserCouponController.java
@@ -1,17 +1,27 @@
package com.dsh.activity.controller;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+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.CouponStore;
-import com.dsh.activity.entity.UserCoupon;
+import com.dsh.activity.entity.*;
+import com.dsh.activity.feignclient.account.AppUserClient;
+import com.dsh.activity.feignclient.account.StudentClient;
+import com.dsh.activity.feignclient.account.model.AppUser;
import com.dsh.activity.feignclient.model.CouponStuAvailableVo;
import com.dsh.activity.feignclient.model.QueryUserCouponByIdAndUserId;
+import com.dsh.activity.feignclient.other.SiteClient;
+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.GrantCoupon;
import com.dsh.activity.model.SendCouponReq;
import com.dsh.activity.service.CouponStoreService;
import com.dsh.activity.service.ICouponService;
import com.dsh.activity.service.UserCouponService;
+import com.dsh.activity.service.VipDetailService;
+import com.dsh.activity.util.DateUtil;
import com.dsh.activity.util.ResultUtil;
import com.dsh.activity.util.TokenUtil;
import io.swagger.annotations.Api;
@@ -19,13 +29,12 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
@Api
@@ -43,9 +52,20 @@
@Autowired
private UserCouponService userCouponService;
-
@Autowired
private CouponStoreService csServie;
+
+ @Resource
+ private AppUserClient appUserClient;
+
+ @Resource
+ private StudentClient studentClient;
+ @Autowired
+ private VipDetailService vipDetailService;
+ @Autowired
+ private StoreClient storeClient;
+ @Autowired
+ private SiteClient siteClient;
@@ -53,14 +73,14 @@
private final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM");
@PostMapping("/base/userConpon/getStuOfConpons")
- public List<CouponStuAvailableVo> queryUserWithConponList(@RequestParam("appUserId") Integer appUserId){
+ public List<CouponStuAvailableVo> queryUserWithConponList(@RequestParam("appUserId") Integer appUserId) {
List<CouponStuAvailableVo> availableVos = new ArrayList<>();
List<UserCoupon> list = userCouponService.list(new QueryWrapper<UserCoupon>()
.eq("userId", appUserId)
- .eq("status",1));
- if (list.size() > 0){
+ .eq("status", 1));
+ if (list.size() > 0) {
List<Integer> collect = list.stream().map(UserCoupon::getCouponId).collect(Collectors.toList());
List<Coupon> conponList = cService.list(new QueryWrapper<Coupon>()
.in("id", collect));
@@ -69,8 +89,8 @@
availableVo.setConponId(coupon.getId());
availableVo.setConponName(coupon.getName());
availableVo.setConponType(coupon.getType());
- Map<String,Object> conponRuleMap = cService.queryConponRuleOfJson(coupon.getId());
- switch (coupon.getType()){
+ Map<String, Object> conponRuleMap = cService.queryConponRuleOfJson(coupon.getId());
+ switch (coupon.getType()) {
case 1:
Object conditionalAmount = conponRuleMap.get("conditionalAmount");
Object deductionAmount = conponRuleMap.get("deductionAmount");
@@ -79,7 +99,7 @@
break;
case 2:
Object amount = conponRuleMap.get("deductionAmount");
- availableVo.setAmount((double)amount);
+ availableVo.setAmount((double) amount);
break;
default:
break;
@@ -92,19 +112,19 @@
}
@PostMapping("/base/userConpon/queryCouponRules")
- public Map<String,Object> getCouponRules(@RequestBody Integer couponId){
+ public Map<String, Object> getCouponRules(@RequestBody Integer couponId) {
return cService.queryConponRuleOfJson(couponId);
}
@ResponseBody
@PostMapping("/base/userConpon/getCoupons")
- public List<Coupon> getCoupons(@RequestBody String couponIds){
+ public List<Coupon> getCoupons(@RequestBody String couponIds) {
ArrayList<Integer> integers = new ArrayList<>();
for (String s : couponIds.split(",")) {
Integer integer = Integer.valueOf(s);
integers.add(integer);
}
- return cService.list(new LambdaQueryWrapper<Coupon>().in(Coupon::getId,integers));
+ return cService.list(new LambdaQueryWrapper<Coupon>().in(Coupon::getId, integers));
}
@@ -118,21 +138,19 @@
@ApiImplicitParam(value = "纬度", name = "lat", dataType = "string", required = true),
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<List<CouponListVo>> queryAvailableCouponList(Integer coursePackageId, Double price, String lon, String lat){
+ public ResultUtil<List<CouponListVo>> queryAvailableCouponList(Integer coursePackageId, Double price, String lon, String lat) {
try {
Integer uid = tokenUtil.getUserIdFormRedis();
- if(null == uid){
+ if (null == uid) {
return ResultUtil.tokenErr();
}
List<CouponListVo> listVos = userCouponService.queryAvailableCouponList(uid, coursePackageId, price, lon, lat);
return ResultUtil.success(listVos);
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
return ResultUtil.runErr();
}
}
-
-
@ResponseBody
@@ -145,55 +163,129 @@
@ApiImplicitParam(value = "纬度", name = "lat", dataType = "string", required = true),
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<List<CouponListVo>> querySiteCouponList(Integer siteId, Double price, String lon, String lat){
+ public ResultUtil<List<CouponListVo>> querySiteCouponList(Integer siteId, Double price, String lon, String lat) {
try {
Integer uid = tokenUtil.getUserIdFormRedis();
- if(null == uid){
+ if (null == uid) {
return ResultUtil.tokenErr();
}
List<CouponListVo> listVos = userCouponService.querySiteCouponList(uid, siteId, price, lon, lat);
return ResultUtil.success(listVos);
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
return ResultUtil.runErr();
}
}
-
-
/**
* 根据id获取用户优惠券数据
- * @param id
+ *
+ * @param
* @return
*/
@ResponseBody
@PostMapping("/userCoupon/queryUserCouponById")
- public UserCoupon queryUserCouponById(@RequestBody QueryUserCouponByIdAndUserId userCouponByIdAndUserId){
+ public UserCoupon queryUserCouponById(@RequestBody QueryUserCouponByIdAndUserId userCouponByIdAndUserId) {
try {
- UserCoupon userCoupon = userCouponService.getOne(new LambdaQueryWrapper<UserCoupon>().eq(UserCoupon::getId,userCouponByIdAndUserId.getId()).eq(UserCoupon::getUserId,userCouponByIdAndUserId.getUserId()));
+ UserCoupon userCoupon = userCouponService.getOne(new LambdaQueryWrapper<UserCoupon>().eq(UserCoupon::getId, userCouponByIdAndUserId.getId()).eq(UserCoupon::getUserId, userCouponByIdAndUserId.getUserId()));
return userCoupon;
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
return null;
}
}
+
+ @ResponseBody
+ @PostMapping("/userCoupon/queryUserCouponById1")
+ public UserCoupon queryUserCouponById1(@RequestBody Long id) {
+ try {
+ UserCoupon userCoupon = userCouponService.getOne(new LambdaQueryWrapper<UserCoupon>().eq(UserCoupon::getId, id));
+ return userCoupon;
+ } catch (Exception e) {
+ e.printStackTrace();
+ return null;
+ }
+ }
+
+ @ResponseBody
+ @PostMapping("/userCoupon/updateUserCouponStatus/{id}/{storeId}/{siteId}")
+ public void updateUserCouponStatus(@PathVariable("id") Long id,@PathVariable("storeId") Integer storeId,@PathVariable("siteId") Integer siteId) {
+
+ UserCoupon userCoupon = userCouponService.getOne(new LambdaQueryWrapper<UserCoupon>().eq(UserCoupon::getId, id));
+ userCoupon.setUserId(null);
+ userCoupon.setStatus(2);
+ userCouponService.updateById(userCoupon);
+ if (userCoupon.getIsVipGrant()!=null && userCoupon.getIsVipGrant()==1){
+ VipDetail vipDetailServiceById = vipDetailService.getById(userCoupon.getVipDetailId());
+ vipDetailServiceById.setStatus(2);
+ List<Store> stores = storeClient.queryStoreByIds(Collections.singletonList(storeId));
+ Store store = stores.get(0);
+ vipDetailServiceById.setUseSiteId(siteId);
+ vipDetailServiceById.setUseStoreId(storeId);
+ if (store.getOperatorId()==0){
+ vipDetailServiceById.setOperatorId(0);
+ }else{
+ vipDetailServiceById.setOperatorId(store.getOperatorId());
+ }
+ vipDetailServiceById.setUseTime(new Date());
+ vipDetailService.updateById(vipDetailServiceById);
+ }
+ }
+
@Autowired
private ICouponService couponService;
+
+ @PostMapping("/userCoupon/edit")
+ public void edit(@RequestBody UserCoupon userCoupon) {
+ userCoupon.setUserId(null);
+ userCouponService.updateById(userCoupon);
+
+ }
+
@PostMapping("/userCoupon/sendUserCoupon")
- public void sendUserCoupon(@RequestBody SendCouponReq sendCouponReq){
+ public void sendUserCoupon(@RequestBody SendCouponReq sendCouponReq) {
try {
String couponIds = sendCouponReq.getCouponIds();
for (String s : couponIds.split(",")) {
Coupon coupon = couponService.getById(s);
+ Integer userId = sendCouponReq.getUserId();
+ if(coupon.getAuditStatus() != 2){
+ continue;
+ }
+ if(coupon.getStatus() != 2){
+ continue;
+ }
+ if(coupon.getState() != 1){
+ continue;
+ }
+ if(coupon.getUserPopulation() == 2){
+ AppUser appUser = appUserClient.queryAppUser(userId);
+ if(appUser.getIsVip() == 0){
+ continue;
+ }
+ }
+ if(coupon.getUserPopulation() == 3){
+ List<TStudent> tStudents = studentClient.queryStudentList(userId);
+ if(tStudents.size() == 0){
+ continue;
+ }
+ }
+ if (new Date().before(coupon.getStartTime()) && new Date().after(coupon.getEndTime())) {
+ continue;
+ }
//查询该优惠卷的数量够不够
List<Integer> queryIds = new ArrayList<>();
queryIds.add(coupon.getId());
int counts = userCouponService.count(new QueryWrapper<UserCoupon>().eq("couponId", s));
- if (coupon.getQuantityIssued()<=counts){
+ if (coupon.getQuantityIssued() <= counts) {
continue;
}
-
+ counts = userCouponService.count(new QueryWrapper<UserCoupon>().eq("couponId", s).eq("userId", userId));
+ if (coupon.getPickUpQuantity() <= counts) {
+ continue;
+ }
+
UserCoupon userCoupon = new UserCoupon();
userCoupon.setCouponId(Integer.valueOf(s));
userCoupon.setUserId(sendCouponReq.getUserId());
@@ -201,7 +293,7 @@
userCoupon.setInsertTime(new Date());
userCouponService.save(userCoupon);
}
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
}
}
@@ -209,36 +301,55 @@
/**
* 修改优惠券数据
+ *
* @param userCoupon
*/
@ResponseBody
@PostMapping("/userCoupon/updateUserCoupon")
- public void updateUserCoupon(@RequestBody UserCoupon userCoupon){
+ public void updateUserCoupon(@RequestBody UserCoupon userCoupon) {
try {
+
userCoupon.setUserId(null);
+
userCouponService.updateById(userCoupon);
- }catch (Exception e){
+ UserCoupon byId = userCouponService.getById(userCoupon.getId());
+ if (byId.getIsVipGrant()!=null && byId.getIsVipGrant()==1){
+ VipDetail vipDetailServiceById = vipDetailService.getById(byId.getVipDetailId());
+ vipDetailServiceById.setStatus(2);
+ vipDetailServiceById.setUseSiteId(byId.getSiteId());
+ List<Store> stores = storeClient.queryStoreByIds(Collections.singletonList(vipDetailServiceById.getUseStoreId()));
+ Store store = stores.get(0);
+ vipDetailServiceById.setUseStoreId(store.getId());
+ vipDetailServiceById.setStatus(2);
+ vipDetailServiceById.setUseTime(new Date());
+ if (store.getOperatorId()==null|| store.getOperatorId()==0){
+ vipDetailServiceById.setOperatorId(0);
+ }else{
+ vipDetailServiceById.setOperatorId(store.getOperatorId());
+ }
+ vipDetailService.updateById(vipDetailServiceById);
+ }
+ } catch (Exception e) {
e.printStackTrace();
}
}
-
-
+
@ResponseBody
@PostMapping("/userCoupon/queryCouponOfStore")
- public List<Integer> getCouponStoreIds(@RequestBody Integer couponId){
+ public List<Integer> getCouponStoreIds(@RequestBody Integer couponId) {
try {
List<Integer> storeIds = new ArrayList<>();
List<CouponStore> list = csServie.list(new QueryWrapper<CouponStore>()
- .eq("couponId",couponId));
- if (list.size() > 0 ){
+ .eq("couponId", couponId));
+ if (list.size() > 0) {
storeIds = list.stream().map(CouponStore::getStoreId).collect(Collectors.toList());
}
- if(storeIds.size()==0){
+ if (storeIds.size() == 0) {
storeIds.add(-1);
}
return storeIds;
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
return null;
}
@@ -247,8 +358,8 @@
@ResponseBody
@PostMapping("/userCoupon/queryCounts")
- public Integer queryCounts(@RequestBody List<Integer> queryIds){
- return userCouponService.count(new QueryWrapper<UserCoupon>().eq("couponId",queryIds.get(0)));
+ public Integer queryCounts(@RequestBody List<Integer> queryIds) {
+ return userCouponService.count(new QueryWrapper<UserCoupon>().eq("couponId", queryIds.get(0)));
}
@@ -256,10 +367,97 @@
@ResponseBody
@PostMapping("/userCoupon/queryCounts1")
- public Integer queryCounts1(@RequestBody List<Integer> queryIds){
- return userCouponService.count(new QueryWrapper<UserCoupon>().eq("couponId",queryIds.get(0)).eq("userId",queryIds.get(1)));
-
-
+ public Integer queryCounts1(@RequestBody List<Integer> queryIds) {
+ return userCouponService.count(new QueryWrapper<UserCoupon>().eq("couponId", queryIds.get(0)).eq("userId", queryIds.get(1)));
}
-
+ @GetMapping("/userCoupon/setStatusVipDetail/{id}")
+ void setStatusVipDetail(@PathVariable("id") Integer id){
+ List<VipDetail> list = vipDetailService.lambdaQuery().eq(VipDetail::getVipPaymentId, id).list();
+ for (VipDetail vipDetail : list) {
+ vipDetail.setStatus(3);
+ if (vipDetail.getType()==1){
+ // 将优惠券修改为过期
+ UserCoupon userCoupon = userCouponService.getById(vipDetail.getUserCouponId());
+ userCoupon.setUserId(null);
+ userCoupon.setStatus(3);
+ userCouponService.updateById(userCoupon);
+ }
+ }
+ vipDetailService.updateBatchById(list);
+ }
+ // 开通会员后 赠送优惠券和门票
+ @ResponseBody
+ @PostMapping("/userCoupon/grantCoupon")
+ public void grantCoupon(@RequestBody GrantCoupon grantCoupon) {
+ String couponJson = grantCoupon.getCouponJson();
+ if (StringUtils.hasLength(couponJson)) {
+
+ // 赠送优惠券
+ JSONArray objects = JSON.parseArray(couponJson);
+ for (Object object : objects) {
+ JSONObject jsonObject = (JSONObject) object;
+ // 优惠券id
+ String id = jsonObject.getString("id");
+ // 优惠券数量
+ String value = jsonObject.getString("value");
+ for (Integer i = 0; i < Integer.valueOf(value); i++) {
+ UserCoupon userCoupon = new UserCoupon();
+ userCoupon.setCouponId(Integer.valueOf(id));
+ userCoupon.setUserId(grantCoupon.getUserId());
+ userCoupon.setStatus(1);
+ userCoupon.setVerificationUserId(null);
+ userCoupon.setVerificationTime(null);
+ userCoupon.setInsertTime(new Date());
+ userCoupon.setIsVipGrant(1);
+ userCouponService.save(userCoupon);
+ // 生成对应的权益明细记录
+ VipDetail vipDetail = new VipDetail();
+ vipDetail.setAppUserId(grantCoupon.getUserId());
+ vipDetail.setStatus(1);
+ vipDetail.setInsertTime(new Date());
+ vipDetail.setVipId(grantCoupon.getVipId());
+ vipDetail.setType(1);
+ vipDetail.setVipPaymentId(grantCoupon.getVipPaymentId());
+ vipDetail.setCouponId(Integer.valueOf(id));
+ vipDetail.setUserCouponId(userCoupon.getId());
+ vipDetailService.save(vipDetail);
+ userCoupon.setVipDetailId(vipDetail.getId());
+ userCoupon.setUserId(null);
+ userCouponService.updateById(userCoupon);
+ }
+ }
+ }
+ String ticketJson = grantCoupon.getTicketJson();
+ if (StringUtils.hasLength(ticketJson)) {
+ // 赠送门票
+ JSONArray objects = JSON.parseArray(ticketJson);
+ for (Object object : objects) {
+ JSONObject jsonObject = (JSONObject) object;
+ // 门票名称
+ String name = jsonObject.getString("name");
+ // 领取后x天有效
+ String time = jsonObject.getString("time");
+ Integer days = Integer.valueOf(time);
+ // 可用次数
+ String count = jsonObject.getString("count");
+ for (Integer i = 0; i < Integer.valueOf(count); i++) {
+ // 生成对应的权益明细记录
+ VipDetail vipDetail = new VipDetail();
+ vipDetail.setTicketName(name);
+ vipDetail.setStartTime(new Date());
+ Date date = new Date();
+ // 加X天
+ Date tomorrow = new Date(date.getTime() + 24 * 60 * 60 * 1000L * days);
+ vipDetail.setEndTime(tomorrow);
+ vipDetail.setAppUserId(grantCoupon.getUserId());
+ vipDetail.setStatus(1);
+ vipDetail.setInsertTime(new Date());
+ vipDetail.setVipId(grantCoupon.getVipId());
+ vipDetail.setType(2);
+ vipDetail.setVipPaymentId(grantCoupon.getVipPaymentId());
+ vipDetailService.save(vipDetail);
+ }
+ }
+ }
+ }
}
--
Gitblit v1.7.1