|
@@ -233,6 +233,8 @@ public class ActivityPlanServiceImpl extends ServiceImpl<ActivityPlanDao, Activi
|
|
|
activityRegistration.setActivityId(userOrderDetailVo.getBizId());
|
|
|
activityRegistration.setCreateTime(new Date());
|
|
|
activityRegistrationService.save(activityRegistration);
|
|
|
+
|
|
|
+ sendMessage(userOrderDetailVo.getGoodName(),userOrderDetailVo.getUserId());
|
|
|
}
|
|
|
|
|
|
@Override
|
|
@@ -243,26 +245,11 @@ public class ActivityPlanServiceImpl extends ServiceImpl<ActivityPlanDao, Activi
|
|
|
}
|
|
|
|
|
|
checkActivityPay(activityEvaluation.getActivityId());
|
|
|
- if (!checkoutJoinActivity(activityEvaluation.getActivityId(), user.getId())) {
|
|
|
- ActivityPlan activityPlan = this.getById(activityEvaluation.getActivityId());
|
|
|
- if (RegistrationMethodEnum.FREE.equals(activityPlan.getRegistrationMethod())) {
|
|
|
-
|
|
|
- // 免费活动 参与时 添加报名记录
|
|
|
- ActivityRegistration activityRegistration = new ActivityRegistration();
|
|
|
- activityRegistration.setUserId(user.getId());
|
|
|
- activityRegistration.setOrderNo(null);
|
|
|
- activityRegistration.setSubOrderNo(null);
|
|
|
- activityRegistration.setActivityId(activityEvaluation.getActivityId());
|
|
|
- activityRegistration.setCreateTime(new Date());
|
|
|
- activityRegistrationService.save(activityRegistration);
|
|
|
-
|
|
|
-
|
|
|
- } else {
|
|
|
- throw new BizException("请先报名参与");
|
|
|
- }
|
|
|
+ if (!checkoutJoinActivity(activityEvaluation.getActivityId(),user.getId())) {
|
|
|
+ throw new BizException("请先报名参与");
|
|
|
}
|
|
|
|
|
|
- List<Long> joinEvaluationIdList = activityEvaluationRecordService.getJoinEvaluationIdList(activityEvaluation.getActivityId(), user.getId());
|
|
|
+ List<Long> joinEvaluationIdList = activityEvaluationRecordService.getJoinEvaluationIdList(activityEvaluation.getActivityId(),user.getId());
|
|
|
|
|
|
// 保存参与活动项目记录
|
|
|
if (CollectionUtils.isEmpty(joinEvaluationIdList)) {
|
|
@@ -280,6 +267,37 @@ public class ActivityPlanServiceImpl extends ServiceImpl<ActivityPlanDao, Activi
|
|
|
return true;
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ public Boolean joinActivity(Long activityId, SysUser user) {
|
|
|
+ checkActivityPay(activityId);
|
|
|
+ ActivityPlan activityPlan = this.getById(activityId);
|
|
|
+ if (checkoutJoinActivity(activityId,user.getId())) {
|
|
|
+ throw new BizException("您已经报名了");
|
|
|
+ }
|
|
|
+ if (RegistrationMethodEnum.CHARGE.equals(activityPlan.getRegistrationMethod())) {
|
|
|
+ throw new BizException("收费活动,请下单报名");
|
|
|
+ }
|
|
|
+
|
|
|
+ // 免费活动 参与时 添加报名记录
|
|
|
+ ActivityRegistration activityRegistration = new ActivityRegistration();
|
|
|
+ activityRegistration.setUserId(user.getId());
|
|
|
+ activityRegistration.setOrderNo(null);
|
|
|
+ activityRegistration.setSubOrderNo(null);
|
|
|
+ activityRegistration.setActivityId(activityId);
|
|
|
+ activityRegistration.setCreateTime(new Date());
|
|
|
+ activityRegistrationService.save(activityRegistration);
|
|
|
+
|
|
|
+ sendMessage(activityPlan.getActivityName(),user.getId());
|
|
|
+
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+
|
|
|
+ private void sendMessage(String activityName, Long userId) {
|
|
|
+
|
|
|
+ // TODO 发送消息
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
private void checkActivityPay(Long planId) {
|
|
|
if (planId == null) {
|
|
|
throw new BizException("活动id不能为空");
|