xhxu 5 лет назад
Родитель
Сommit
759f4060c8
2 измененных файлов: 14 добавлений и 2 удалений
  1. +2
    -0
      mallinkService/src/main/java/com/iformall/common/ErrorCode.java
  2. +12
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java

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

@@ -541,6 +541,8 @@ public enum ErrorCode{
ACTIVITY_WAIT_CONFIRMED(30006, "您报名的活动还在审核中"),
ACTIVITY_EXPIRED(30007, "您报名的活动已过期"),
ACTIVITY_SEND_ERROR_NOONLINE(30008, "活动投放到宣传页失败,活动未上线!"),
ACTIVITY_NOT_FOND(30009, "活动未找到!"),
ACTIVITY_JOIN_TIME_START(30010, "活动报名时间未开始!"),

/**
* 文件上传


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

@@ -166,6 +166,18 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService {
@Transactional(propagation = Propagation.REQUIRED, rollbackFor = {Exception.class})
@Override
public ResultData join(WxActivityJoin wxActivityJoin) {
WxActivity wxActivity = wxActivityMapper.selectById(wxActivityJoin.getActivityId());
if(wxActivity == null){
return new ResultData(ErrorCode.ACTIVITY_NOT_FOND);
}
Date date = new Date();
if(date.getTime() < wxActivity.getStartTime().getTime()){
return new ResultData(ErrorCode.ACTIVITY_JOIN_TIME_START);
}
if(date.getTime() > wxActivity.getEndTime().getTime()){
return new ResultData(ErrorCode.ACTIVITY_JOIN_TIME_END);
}

WxActivityJoin joinQuery = new WxActivityJoin();
joinQuery.setUserId(wxActivityJoin.getUserId());
joinQuery.setActivityId(wxActivityJoin.getActivityId());
@@ -175,8 +187,6 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService {
}
WxCUserBasicInfo user = wxCUserBasicInfoMapper.selectById(wxActivityJoin.getUserId(),wxActivityJoin.getFinalTenantId());
//查询是否消耗积分
WxActivity wxActivity = wxActivityMapper.selectById(wxActivityJoin.getActivityId());
Date date = new Date();
if (wxActivity.getUseCredit().equals(EnumActivityUseCreditStatus.YES.getCode())) {
Integer credit = wxActivity.getCredit();
//积分历史


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