nickchange
2023-11-21 41b60f3df5f3054aad44307c13a26b14f3b32ac0
cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java
@@ -89,22 +89,26 @@
            LocalDateTime currentTime = LocalDateTime.now();
            LocalDateTime oneMinuteAgo = currentTime.minusSeconds(30);
            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) {
//            if (ids.size()>0){
                List<Coupon> userId = couponService.list(new QueryWrapper<Coupon>().in("id",ids));
//                return userId;
//
//            }
                userId = couponService.list(new QueryWrapper<Coupon>().in("id", ids));
            }
            for (Coupon coupon : userId) {
                if (coupon.getDistributionMethod()!=2){
                    continue;
                }
                CouponListVo couponListVo = new CouponListVo();
                couponListVo.setId(coupon.getId().longValue());
                couponListVo.setName(coupon.getName());
@@ -148,7 +152,6 @@
                ofSearch.getUserPopulation(),
                ofSearch.getStatus(),
                ofSearch.getState(),
                ofSearch.getPage(),
                ofSearch.getCityCode(),
                ofSearch.getStoreId(),
                ofSearch.getOperatorId(),