From 94f34a5cf9ab374afbaefd566bc0a3dc8a4616dd Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 25 十一月 2023 11:14:37 +0800
Subject: [PATCH] 同步
---
cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java | 50 +++++++++++++++++++++++++++++---------------------
1 files changed, 29 insertions(+), 21 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java
index 0ee3ffb..9328463 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java
@@ -8,6 +8,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dsh.activity.entity.Coupon;
import com.dsh.activity.entity.TStudent;
+import com.dsh.activity.entity.UserCoupon;
import com.dsh.activity.feignclient.account.AppUserClient;
import com.dsh.activity.feignclient.account.StudentClient;
import com.dsh.activity.feignclient.account.model.AppUser;
@@ -18,14 +19,20 @@
import com.dsh.activity.model.CouponListVo;
import com.dsh.activity.model.request.IntegralGoodsOfSearch;
import com.dsh.activity.service.ICouponService;
+import com.dsh.activity.service.UserCouponService;
+import com.dsh.activity.util.RedisUtil;
+import com.dsh.activity.util.ToolUtil;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
/**
* @author zhibing.pu
@@ -40,6 +47,14 @@
@Resource
private StudentClient studentClient;
+ @Autowired
+ private UserCouponService userCouponService;
+
+ @Autowired
+ private ICouponService couponService;
+
+ @Autowired
+ private RedisUtil redisUtil;
@@ -53,29 +68,22 @@
*/
@Override
public List<CouponListVo> queryCouponList(Integer uid, Integer distributionMethod) throws Exception {
- AppUser appUser = appUserClient.queryAppUser(uid);
+ String value = redisUtil.getValue("VIP_P_" + uid);
+ if(ToolUtil.isEmpty(value)){
+ Thread.sleep(5000);
+ value = redisUtil.getValue("VIP_P_" + uid);
+ }
List<CouponListVo> listVos = new ArrayList<>();
- if (null != appUser) {
- List<Integer> userPopulation = new ArrayList<>();
- userPopulation.add(1);//全部用户
- if (1 == appUser.getIsVip()) {
- userPopulation.add(2);//年度会员
- }
- List<TStudent> students = studentClient.queryStudentList(uid);
- if (students.size() > 0) {
- userPopulation.add(3);//已有学员用户
- }
-// List<Coupon> list = this.list(new QueryWrapper<Coupon>().eq("distributionMethod", distributionMethod)
-// .in("userPopulation", userPopulation)
-// .eq("auditStatus", 2).eq("status", 2).eq("state", 1)
-// .last(" and now() between startTime and endTime order by insertTime desc"));
-
-
- List<Coupon> list = this.list(new QueryWrapper<Coupon>().eq("distributionMethod", 2).eq("userPopulation",2)
- .le("startTime", new Date()).ge("endTime", new Date()).eq("auditStatus", 2)
- .eq("state", 1));
+ if(ToolUtil.isEmpty(value)){
+ List<Long> longs = JSON.parseArray(value, Long.class);
+ List<UserCoupon> list = userCouponService.getBaseMapper().selectBatchIds(longs);
+ List<Integer> collect = list.stream().map(UserCoupon::getCouponId).collect(Collectors.toList());
+ List<Coupon> coupons = couponService.getBaseMapper().selectBatchIds(collect);
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
- for (Coupon coupon : list) {
+ for (Coupon coupon : coupons) {
+ if (coupon.getDistributionMethod()!=2){
+ continue;
+ }
CouponListVo couponListVo = new CouponListVo();
couponListVo.setId(coupon.getId().longValue());
couponListVo.setName(coupon.getName());
--
Gitblit v1.7.1