Merge branch 'dev_1_3_2_20220815'

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

@@ -32,9 +32,9 @@ public interface ActivityRegistrationService extends IService<ActivityRegistrati
 	 * 是否参与活动
 	 *
 	 * @param userId 用户id
-	 * @param activityPlanId
+	 * @param activityId
 	 * @return
 	 */
-    YesOrNoEnum getRegistration(Long userId, Long activityPlanId);
+    YesOrNoEnum getRegistration(Long userId, Long activityId);
 
 }

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

@@ -11,10 +11,7 @@ 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.ActivityTypeEnum;
-import com.yonge.cooleshow.common.enums.CacheNameEnum;
-import com.yonge.cooleshow.common.enums.ConditionEnum;
-import com.yonge.cooleshow.common.enums.ConditionMethodEnum;
+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;
@@ -43,6 +40,8 @@ public class ActivityPlanStandardServiceImpl extends ServiceImpl<ActivityPlanSta
     @Autowired
     private ActivityUserRewardService activityUserRewardService;
     @Autowired
+    private ActivityRegistrationService activityRegistrationService;
+    @Autowired
     private RedissonClient redissonClient;
 
     @Override
@@ -138,6 +137,15 @@ public class ActivityPlanStandardServiceImpl extends ServiceImpl<ActivityPlanSta
             activityUserRewardList.add(userReward);
         }
         activityUserRewardService.saveBatch(activityUserRewardList);
+
+        //若没有报名则给用户报名
+        YesOrNoEnum yesOrNoEnum = activityRegistrationService.getRegistration(userId, activityId);
+        if(YesOrNoEnum.NO.equals(yesOrNoEnum)){
+            ActivityRegistration registration = new ActivityRegistration();
+            registration.setActivityId(activityId);
+            registration.setUserId(userId);
+            activityRegistrationService.save(registration);
+        }
     }
 
     @Override

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

@@ -28,11 +28,10 @@ public class ActivityRegistrationServiceImpl extends ServiceImpl<ActivityRegistr
     }
 
     @Override
-    public YesOrNoEnum getRegistration(Long userId, Long activityPlanId) {
-
+    public YesOrNoEnum getRegistration(Long userId, Long activityId) {
         Integer count = this.lambdaQuery()
                             .eq(ActivityRegistration::getUserId, userId)
-                            .eq(ActivityRegistration::getActivityId, activityPlanId)
+                            .eq(ActivityRegistration::getActivityId, activityId)
                             .count();
         return count>0? YesOrNoEnum.YES:YesOrNoEnum.NO;
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/ActivityPlanVo.java

@@ -30,6 +30,9 @@ public class ActivityPlanVo extends ActivityPlan{
 	@ApiModelProperty("参与人数")
 	private Integer registrationNum;
 
+	@ApiModelProperty("获奖人数")
+	private Integer rewardNum;
+
 	@ApiModelProperty("最后操作人")
 	private String updateByName;
 
@@ -65,6 +68,14 @@ public class ActivityPlanVo extends ActivityPlan{
 		this.registrationNum = registrationNum;
 	}
 
+	public Integer getRewardNum() {
+		return rewardNum;
+	}
+
+	public void setRewardNum(Integer rewardNum) {
+		this.rewardNum = rewardNum;
+	}
+
 	public String getUpdateByName() {
 		return updateByName;
 	}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/ActivityRewardVo.java

@@ -14,6 +14,8 @@ public class ActivityRewardVo extends ActivityReward{
 
 	@ApiModelProperty("最后操作人")
 	private String updateByName;
+	@ApiModelProperty(value = "是否有活动引用")
+	private Boolean useFlag;
 
 	public String getUpdateByName() {
 		return updateByName;
@@ -22,4 +24,12 @@ public class ActivityRewardVo extends ActivityReward{
 	public void setUpdateByName(String updateByName) {
 		this.updateByName = updateByName;
 	}
+
+	public Boolean getUseFlag() {
+		return useFlag;
+	}
+
+	public void setUseFlag(Boolean useFlag) {
+		this.useFlag = useFlag;
+	}
 }

cooleshow-user/user-biz/src/main/resources/config/mybatis/ActivityPlanMapper.xml

@@ -60,8 +60,9 @@
     <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.vo.ActivityPlanVo">
 		SELECT         
         	<include refid="baseColumns" />,
-		       u.username_ as updateByName,
-		       (select count(1) from activity_registration r where t.id_ = r.activity_id_) as registrationNum
+		        u.username_ as updateByName,
+		        (select count(1) from activity_registration r where t.id_ = r.activity_id_) as registrationNum,
+                (select count(distinct r.user_id_) from activity_user_reward r where t.id_ = r.activity_id_) as rewardNum
 		FROM activity_plan t
         LEFT JOIN  sys_user u on t.update_by_ = u.id_
         <where>

cooleshow-user/user-biz/src/main/resources/config/mybatis/ActivityRewardMapper.xml

@@ -55,7 +55,8 @@
     <sql id="selectSql">
         SELECT
             <include refid="baseColumns" />,
-            u.username_ as updateByName
+            u.username_ as updateByName,
+            (select count(1) from activity_plan_reward r where t.id_ = r.reward_id_)>0 as useFlag
         FROM activity_reward t
         left join sys_user u on t.update_by_ = u.id_
         <where>