Merge branch 'dev_1_3_2_20220815' of http://git.dayaedu.com/yonge/cooleshow into dev_1_3_2_20220815

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/ActivityPlanReward.java

@@ -14,6 +14,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Positive;
+import javax.validation.constraints.PositiveOrZero;
 
 /**
  * 活动计划奖品表
@@ -36,7 +37,7 @@ public class ActivityPlanReward implements Serializable {
     @ApiModelProperty("奖品数量 ")
 	@TableField(value = "reward_num_")
     @NotNull(message = "奖品数量不能为空")
-    @Positive(message = "奖品数量必须大于0")
+    @PositiveOrZero(message = "奖品数量必须大于等于0")
     private Integer rewardNum;
     @ApiModelProperty("创建时间 ")
 	@TableField(value = "create_time_")

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/ActivityReward.java

@@ -18,6 +18,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Positive;
+import javax.validation.constraints.PositiveOrZero;
 
 
 /**
@@ -56,7 +57,7 @@ public class ActivityReward implements Serializable {
     @ApiModelProperty("库存数 ")
     @TableField(value = "stock_")
     @NotNull(message = "库存数不能为空")
-    @Positive(message = "库存数必须大于0")
+    @PositiveOrZero(message = "库存数必须大于等于0")
     private Integer stock;
     @ApiModelProperty("数量（每个奖品） ")
     @TableField(value = "num_")

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

@@ -123,7 +123,6 @@ public class ActivityPlanStandardServiceImpl extends ServiceImpl<ActivityPlanSta
         List<ActivityPlanRewardDto> activityPlanRewardDtos = activityPlanRewardService.queryActivityPlanReward(activityId);
         Map<Long, List<UserFirstTime>> userMap = userFirstTimes.stream().collect(Collectors.groupingBy(UserFirstTime::getUserId));
 
-
         if (ConditionMethodEnum.OR.equals(planStandard.getCalculationMethod())) {
             for (Long userId : userIdSortMap.keySet()) {
                 Date createTime = userIdSortMap.get(userId);
@@ -131,7 +130,11 @@ public class ActivityPlanStandardServiceImpl extends ServiceImpl<ActivityPlanSta
                 sendUserReward(userId, detail.getId(), createTime, activityPlanRewardDtos);
             }
         } else {
-            for (Long userId : userIdSortMap.keySet()) {
+            List<Long> mainList = new ArrayList<>();
+            mainList.addAll(userIdSortMap.keySet());
+            Collections.reverse(mainList);
+
+            for (Long userId : mainList) {
                 Date createTime = userIdSortMap.get(userId);
                 List<UserFirstTime> firstTimes = userMap.get(userId);
                 if (firstTimes.size() == timeTypes.size()) {
@@ -147,7 +150,6 @@ public class ActivityPlanStandardServiceImpl extends ServiceImpl<ActivityPlanSta
         //给用户发奖
         List<Long> successRewardIds = activityRewardService.sendReward(userId, activityId);
 
-        List<ActivityUserReward> activityUserRewardList = new ArrayList<>();
         for (ActivityPlanRewardDto dto : activityPlanRewardDtos) {
             ActivityUserReward userReward = new ActivityUserReward();
             userReward.setActivityId(activityId);
@@ -157,9 +159,15 @@ public class ActivityPlanStandardServiceImpl extends ServiceImpl<ActivityPlanSta
             Optional<Long> first = successRewardIds.stream().filter(o -> o.equals(dto.getRewardId())).findFirst();
             userReward.setGrantFlag(first.isPresent() ? 1 : 0);
             userReward.setCreateTime(createTime);
-            activityUserRewardList.add(userReward);
+
+            ActivityUserReward one = activityUserRewardService.getOne(Wrappers.<ActivityUserReward>lambdaQuery()
+                    .eq(ActivityUserReward::getUserId, userId)
+                    .eq(ActivityUserReward::getActivityId, activityId)
+                    .eq(ActivityUserReward::getRewardId, dto.getRewardId()));
+            if(null == one){
+                activityUserRewardService.save(userReward);
+            }
         }
-        activityUserRewardService.saveBatch(activityUserRewardList);
 
         //若没有报名则给用户报名
         YesOrNoEnum yesOrNoEnum = activityRegistrationService.getRegistration(userId, activityId);

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

@@ -436,6 +436,7 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
                 teacherStyleVideoService.update(Wrappers.<TeacherStyleVideo>lambdaUpdate()
                         .set(TeacherStyleVideo::getCover, o.getCover())
                         .set(TeacherStyleVideo::getAuthStatus, AuthStatusEnum.DOING)
+                        .set(TeacherStyleVideo::getEntryFlag, YesOrNoEnum.NO)
                         .eq(TeacherStyleVideo::getId, o.getId()));
             }
         });