Merge branch 'dev_v1.3.4_20220909'

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

@@ -25,6 +25,8 @@ import com.yonge.cooleshow.biz.dal.entity.ActivityPlanEvaluation;
 import com.yonge.cooleshow.biz.dal.dao.ActivityPlanEvaluationDao;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -100,6 +102,14 @@ public class ActivityPlanEvaluationServiceImpl extends ServiceImpl<ActivityPlanE
         Map<String, List<ActivityPlanRewardDto>> rewardMap = detail.getActivityRewardList().stream()
                                                                                  .collect(Collectors.groupingBy(
                                                                                          ActivityPlanReward::getGroup));
+
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date date = new Date();
+        try {
+            date = formatter.parse(formatter.format(new Date()));
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
         for (ActivityEvaluation activityEvaluation : activityEvaluationList) {
 
             List<ActivityRankingVo> activityRankingVos = activityEvaluationRecordService.queryRankingList(activityId,
@@ -117,7 +127,6 @@ 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,date);