From aa925d851857f50eff0556411366690d9a78a0e5 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 27 十一月 2023 17:30:26 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java | 75 ++++++++++++-------------------------
1 files changed, 24 insertions(+), 51 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 031bf29..bb77904 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
@@ -20,6 +20,8 @@
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;
@@ -30,6 +32,7 @@
import java.util.Date;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
/**
* @author zhibing.pu
@@ -44,69 +47,39 @@
@Resource
private StudentClient studentClient;
-
-
-
@Autowired
private UserCouponService userCouponService;
@Autowired
private ICouponService couponService;
+ @Autowired
+ private RedisUtil redisUtil;
+
+
/**
* 获取购买会员支付成功页面的优惠券
+ *
* @param uid
* @return
* @throws Exception
*/
@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");
-
-
-
- LocalDateTime currentTime = LocalDateTime.now();
- LocalDateTime oneMinuteAgo = currentTime.minusSeconds(6000);
-
-
-
- List<UserCoupon> list = userCouponService.list(new QueryWrapper<UserCoupon>().eq("userId", uid).ge("insertTime", oneMinuteAgo));
- List<Integer> ids = new ArrayList<>();
- for (UserCoupon userCoupon : list) {
- ids.add(userCoupon.getCouponId());
- }
- List<Coupon> userId = new ArrayList<>();
- if (ids.size()>0) {
-
- userId = couponService.list(new QueryWrapper<Coupon>().in("id", ids));
- }
-
-
- for (Coupon coupon : userId) {
- if (coupon.getDistributionMethod()!=2){
+ for (Coupon coupon : coupons) {
+ if (coupon.getDistributionMethod() != 2) {
continue;
}
CouponListVo couponListVo = new CouponListVo();
@@ -138,7 +111,6 @@
}
-
@Override
public Map<String, Object> queryConponRuleOfJson(Integer id) {
return this.baseMapper.queryConponRuleOfJson(id);
@@ -160,16 +132,17 @@
@Override
public List<Map<String, Object>> queryCouponListOfSearch1(CouponListOfSearch ofSearch) {
- return this.baseMapper.queryCouponListOfSearch1(ofSearch.getName(),ofSearch.getType(),ofSearch.getDistributionMethod(),ofSearch.getUserPopulation(),ofSearch.getStatus(),ofSearch.getState(),ofSearch.getPage(),ofSearch.getCityCode(),ofSearch.getStoreId());
+ return this.baseMapper.queryCouponListOfSearch1(ofSearch.getName(), ofSearch.getType(), ofSearch.getDistributionMethod(), ofSearch.getUserPopulation(), ofSearch.getStatus(), ofSearch.getState(), ofSearch.getPage(), ofSearch.getCityCode(), ofSearch.getStoreId());
}
+
@Override
public List<Map<String, Object>> queryCouponExamineList(CouponExamineListSearch ofSearch) {
- return this.baseMapper.queryCouponExamineList(ofSearch.getName(),ofSearch.getType(),ofSearch.getUserPopulation(),ofSearch.getDistributionMethod(),ofSearch.getAuditStatus(),ofSearch.getPage());
+ return this.baseMapper.queryCouponExamineList(ofSearch.getName(), ofSearch.getType(), ofSearch.getUserPopulation(), ofSearch.getDistributionMethod(), ofSearch.getAuditStatus(), ofSearch.getPage());
}
@Override
public List<Map<String, Object>> listRecord(Page<Object> objectPage, Integer id, List<Integer> ids, Integer type) {
- return this.baseMapper.listRecord(objectPage,id,ids,type);
+ return this.baseMapper.listRecord(objectPage, id, ids, type);
}
@Override
--
Gitblit v1.7.1