Просмотр исходного кода

[活动][修改][签到]

release_toaliyun_real
gongbiao 7 лет назад
Родитель
Сommit
bf911115bc
5 измененных файлов: 28 добавлений и 3 удалений
  1. +10
    -3
      mallinkCApi/src/main/java/com/iformall/controller/WxActivityJoinController.java
  2. +1
    -0
      mallinkService/src/main/java/com/iformall/common/ErrorCode.java
  3. +2
    -0
      mallinkService/src/main/java/com/iformall/service/WxActivityJoinService.java
  4. +11
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java
  5. +4
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java

+ 10
- 3
mallinkCApi/src/main/java/com/iformall/controller/WxActivityJoinController.java Просмотреть файл

@@ -43,9 +43,6 @@ public class WxActivityJoinController extends BaseController {
@ApiOperation("报名") @ApiOperation("报名")
@PostMapping("join") @PostMapping("join")
public ResultData join(@RequestBody WxActivityJoin wxActivityJoin) { public ResultData join(@RequestBody WxActivityJoin wxActivityJoin) {
if (wxActivityJoin.getUserId() == null) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "userId不能为空");
}
if (wxActivityJoin.getActivityId() == null) { if (wxActivityJoin.getActivityId() == null) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "activityId不能为空"); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "activityId不能为空");
} }
@@ -54,5 +51,15 @@ public class WxActivityJoinController extends BaseController {
return wxActivityJoinService.join(wxActivityJoin); return wxActivityJoinService.join(wxActivityJoin);
} }


@ApiOperation("签到")
@PostMapping("sign")
public ResultData sign(@RequestBody WxActivityJoin wxActivityJoin) {
if (wxActivityJoin.getId() == null) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "Id不能为空");
}
wxActivityJoin.setTenantId(getTenantId());
wxActivityJoin.setUserId(getUserId());
return wxActivityJoinService.sign(wxActivityJoin);
}


} }

+ 1
- 0
mallinkService/src/main/java/com/iformall/common/ErrorCode.java Просмотреть файл

@@ -434,6 +434,7 @@ public enum ErrorCode{
* 活动 * 活动
*/ */
ACTIVITY_PERSON_LIMITED(30000, "活动报名人数超过限制"), ACTIVITY_PERSON_LIMITED(30000, "活动报名人数超过限制"),
ACTIVITY_JOIN_NOT_FOUND(30001, "对不起,您未报名参加该活动")
; ;


private int code; private int code;


+ 2
- 0
mallinkService/src/main/java/com/iformall/service/WxActivityJoinService.java Просмотреть файл

@@ -27,4 +27,6 @@ public interface WxActivityJoinService {


ResultData join(WxActivityJoin wxActivityJoin); ResultData join(WxActivityJoin wxActivityJoin);


ResultData sign(WxActivityJoin wxActivityJoin);

} }

+ 11
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java Просмотреть файл

@@ -159,6 +159,17 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService {
return new ResultData(); return new ResultData();
} }


@Override
public ResultData sign(WxActivityJoin wxActivityJoin) {
WxActivityJoin activityJoin = wxActivityJoinMapper.selectByPrimaryKey(wxActivityJoin.getId());
if (activityJoin.getStatus().equals(EnumActivityJoinStatus.CONFIRMED.getCode())) {
activityJoin.setSignIn(EnumActivityJoinSignStatus.YES.getCode());
wxActivityJoinMapper.updateByPrimaryKeySelective(activityJoin);
return new ResultData(Result.SUCCESS);
}
return new ResultData(ErrorCode.ACTIVITY_JOIN_NOT_FOUND);
}

private void sendMessage(WxActivityJoin join, WxActivity activity) { private void sendMessage(WxActivityJoin join, WxActivity activity) {
logger.info("》》》》》》》》》》》"); logger.info("》》》》》》》》》》》");
logger.info("活动发送短信开始"); logger.info("活动发送短信开始");


+ 4
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java Просмотреть файл

@@ -85,6 +85,9 @@ public class WxActivityServiceImpl implements WxActivityService {
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); return new ResultData(ErrorCode.SYS_PARAMETER_ERROR);
} }
wxActivity.setStatus(EnumActivityStatus.STATUS_THROW_IN.getCode()); wxActivity.setStatus(EnumActivityStatus.STATUS_THROW_IN.getCode());
Date date = new Date();
wxActivity.setCreateTime(date);
wxActivity.setUpdateTime(date);
if (wxActivity.getId() == null) { if (wxActivity.getId() == null) {
final IdWorker idWorker = IdWorker.get(); final IdWorker idWorker = IdWorker.get();
wxActivity.setId(idWorker.nextId()); wxActivity.setId(idWorker.nextId());
@@ -98,6 +101,7 @@ public class WxActivityServiceImpl implements WxActivityService {
@Transactional(propagation = Propagation.REQUIRED, rollbackFor = {Exception.class}) @Transactional(propagation = Propagation.REQUIRED, rollbackFor = {Exception.class})
@Override @Override
public ResultData updateStatus(WxActivity wxActivity) { public ResultData updateStatus(WxActivity wxActivity) {
wxActivity.setUpdateTime(new Date());
wxActivityMapper.updateByPrimaryKeySelective(wxActivity); wxActivityMapper.updateByPrimaryKeySelective(wxActivity);
return new ResultData(Result.SUCCESS, "操作成功"); return new ResultData(Result.SUCCESS, "操作成功");
} }


Загрузка…
Отмена
Сохранить