Merge branch 'dev_v1.3.4_20220909' into dev_v1.3.4_20220914

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/coupon/CouponIssueController.java

@@ -3,14 +3,12 @@ package com.yonge.cooleshow.admin.controller.coupon;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yonge.cooleshow.admin.io.request.coupon.CouponInfoVO;
 import com.yonge.cooleshow.admin.io.request.coupon.CouponIssueVo;
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.entity.CouponIssue;
 import com.yonge.cooleshow.biz.dal.enums.SendTypeEnum;
 import com.yonge.cooleshow.biz.dal.enums.coupon.CouponUseStateEnum;
-import com.yonge.cooleshow.biz.dal.queryInfo.CouponInfoQuery;
 import com.yonge.cooleshow.biz.dal.queryInfo.CouponIssueQueryInfo;
 import com.yonge.cooleshow.biz.dal.service.CouponIssueService;
 import com.yonge.cooleshow.biz.dal.vo.CouponIssueUserVo;
@@ -26,7 +24,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
-import java.time.Instant;
+import java.util.Date;
 import java.util.List;
 
 import static com.yonge.cooleshow.common.entity.HttpResponseResult.failed;
@@ -99,7 +97,7 @@ public class CouponIssueController {
             return failed("用户信息获取失败");
         }
         couponIssueService.issueCoupon(param.getCouponId(), param.getUserParam(), sysUser.getId(), param.getRemark(), true, true,
-                                       SendTypeEnum.PLATFORM);
+                                       SendTypeEnum.PLATFORM, new Date());
 
         return succeed();
     }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/ActivityRewardService.java

@@ -11,6 +11,7 @@ import com.yonge.cooleshow.biz.dal.vo.ActivityRewardVo;
 import com.yonge.cooleshow.biz.dal.dto.search.ActivityRewardSearch;
 import com.yonge.cooleshow.biz.dal.entity.ActivityReward;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -85,9 +86,10 @@ public interface ActivityRewardService extends IService<ActivityReward>  {
 	 * 发放获奖奖品
 	 * @param userId 用户id
 	 * @param activityId 活动id
+	 * @param date
 	 * @return 返回发放成功奖品id
 	 */
-	List<Long> sendReward(Long userId, Long activityId,List<Long> rewardIdList);
+	List<Long> sendReward(Long userId, Long activityId, List<Long> rewardIdList, Date date);
 
 	Boolean userRewarded(Long userId, Long activityId);
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/CouponIssueService.java

@@ -12,6 +12,7 @@ import com.yonge.cooleshow.biz.dal.vo.CouponIssueUserVo;
 import com.yonge.cooleshow.biz.dal.vo.coupon.CouponInfoWrapper;
 import com.yonge.cooleshow.biz.dal.vo.coupon.CouponIssueWrapper;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -47,9 +48,10 @@ public interface CouponIssueService extends IService<CouponIssue> {
      * @param userParam 用户信息
      * @param issuer
      * @param reason
+     * @param date
      * @return
      */
-    Boolean issueCoupon(Long couponId, List<UserParam> userParam, Long issuer, String reason, Boolean sendMessage, Boolean throwE, SendTypeEnum issueWay);
+    Boolean issueCoupon(Long couponId, List<UserParam> userParam, Long issuer, String reason, Boolean sendMessage, Boolean throwE, SendTypeEnum issueWay, Date date);
 
     /**
      * 查询能发放优惠券的用户列表

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ActivityPlanEvaluationServiceImpl.java

@@ -117,8 +117,9 @@ public class ActivityPlanEvaluationServiceImpl extends ServiceImpl<ActivityPlanE
                                    .map(activityPlanRewardDto -> activityPlanRewardDto.getActivityReward().getId())
                                    .collect(Collectors.toList());
 
+                Date date = new Date();
                 //给用户发放奖品 传入用户id和活动id
-                List<Long> successRewardIds = activityRewardService.sendReward(activityRankingVo.getUserId(), activityId,rewardIdList);
+                List<Long> successRewardIds = activityRewardService.sendReward(activityRankingVo.getUserId(), activityId,rewardIdList,date);
 
                 // 保存奖品发放记录
                 for (Long rewardId : rewardIdList) {
@@ -129,8 +130,8 @@ public class ActivityPlanEvaluationServiceImpl extends ServiceImpl<ActivityPlanE
                     activityUserReward.setRankingRule(detail.getRankingRule());
                     activityUserReward.setRanking(i+1);
                     activityUserReward.setGrantFlag(0);
-                    activityUserReward.setCreateTime(new Date());
-                    activityUserReward.setUpdateTime(new Date());
+                    activityUserReward.setCreateTime(date);
+                    activityUserReward.setUpdateTime(date);
                     activityUserReward.setRewardId(rewardId);
                     if (successRewardIds.contains(rewardId)) {
                         activityUserReward.setGrantFlag(1);

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ActivityPlanStandardServiceImpl.java

@@ -7,12 +7,10 @@ import com.yonge.cooleshow.biz.dal.dto.ActivityPlanDto;
 import com.yonge.cooleshow.biz.dal.dto.ActivityPlanRewardDto;
 import com.yonge.cooleshow.biz.dal.dto.search.UserFirstTimeSearch;
 import com.yonge.cooleshow.biz.dal.entity.*;
-import com.yonge.cooleshow.biz.dal.enums.InOrOutEnum;
 import com.yonge.cooleshow.biz.dal.service.*;
 import com.yonge.cooleshow.biz.dal.support.WrapperUtil;
 import com.yonge.cooleshow.biz.dal.vo.ActivityPlanVo;
 import com.yonge.cooleshow.common.enums.*;
-import com.yonge.toolset.base.exception.BizException;
 import com.yonge.toolset.payment.util.DistributedLock;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,7 +18,6 @@ import org.springframework.stereotype.Service;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import com.yonge.cooleshow.biz.dal.dao.ActivityPlanStandardDao;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -152,7 +149,7 @@ public class ActivityPlanStandardServiceImpl extends ServiceImpl<ActivityPlanSta
                                                                                                       .getId())
                                                    .collect(Collectors.toList());
         //给用户发奖
-        List<Long> successRewardIds = activityRewardService.sendReward(userId, activityId,rewardIdList);
+        List<Long> successRewardIds = activityRewardService.sendReward(userId, activityId, rewardIdList, new Date());
 
         for (ActivityPlanRewardDto dto : activityPlanRewardDtos) {
             ActivityUserReward userReward = new ActivityUserReward();

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ActivityRewardServiceImpl.java

@@ -236,7 +236,7 @@ public class ActivityRewardServiceImpl extends ServiceImpl<ActivityRewardDao, Ac
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public List<Long> sendReward(Long userId, Long activityId,List<Long> rewardIdList) {
+    public List<Long> sendReward(Long userId, Long activityId, List<Long> rewardIdList, Date date) {
         if (userRewarded(userId, activityId)) {
             return new ArrayList<>();
         }
@@ -293,7 +293,7 @@ public class ActivityRewardServiceImpl extends ServiceImpl<ActivityRewardDao, Ac
                     userParam.setClientType(activityPlan.getActivityClient());
                     list.add(userParam);
                     Boolean issueCoupon = couponIssueService.issueCoupon(activityReward.getCouponId(), list, null, activityPlan.getActivityName(),
-                                                                         false, false, SendTypeEnum.ACTIVITY);
+                                                                         false, false, SendTypeEnum.ACTIVITY,date);
                     if (!issueCoupon) {
                         continue;
                     }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/CouponIssueServiceImp.java

@@ -40,11 +40,7 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.ZoneId;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -157,7 +153,7 @@ public class CouponIssueServiceImp extends ServiceImpl<CouponIssueMapper, Coupon
 
     @Override
     @Transactional
-    public Boolean issueCoupon(Long couponId, List<UserParam> userParam, Long issuer, String reason, Boolean sendMessage, Boolean throwE,SendTypeEnum issueWay) {
+    public Boolean issueCoupon(Long couponId, List<UserParam> userParam, Long issuer, String reason, Boolean sendMessage, Boolean throwE, SendTypeEnum issueWay, Date date) {
         CouponInfo couponInfo = couponInfoService.queryCouponInfoById(couponId);
         if (couponInfo == null) {
             if (!throwE) return false;
@@ -195,7 +191,7 @@ public class CouponIssueServiceImp extends ServiceImpl<CouponIssueMapper, Coupon
             CouponIssue couponIssue = new CouponIssue();
             couponIssue.setCouponId(couponId);
             couponIssue.setIssuer(issuer);
-            couponIssue.setIssueTime(DateTime.now().getMillis());
+            couponIssue.setIssueTime(date.toInstant().toEpochMilli());
             couponIssue.setIssueWay(issueWay.getCode());
             couponIssue.setRemark(reason);
             couponIssue.setStartTime(startTime);