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

[活动][修改][错误指示]

release_toaliyun_real
gongbiao 6 лет назад
Родитель
Сommit
aa6e58c6d7
2 измененных файлов: 7 добавлений и 8 удалений
  1. +6
    -1
      mallinkCApi/src/main/java/com/iformall/controller/WxActivityJoinController.java
  2. +1
    -7
      mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java

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

@@ -5,6 +5,7 @@ import com.iformall.common.ErrorCode;
import com.iformall.common.ResultData;
import com.iformall.domain.po.WxActivity;
import com.iformall.domain.po.WxActivityJoin;
import com.iformall.exception.MallinkException;
import com.iformall.service.WxActivityJoinService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -50,7 +51,11 @@ public class WxActivityJoinController extends BaseController {
wxActivityJoin.setTenantId(getTenantId());
wxActivityJoin.setUserId(getUserId());
wxActivityJoin.setNickName(getUser().getNickName());
return wxActivityJoinService.join(wxActivityJoin);
try {
return wxActivityJoinService.join(wxActivityJoin);
} catch (MallinkException e) {
return new ResultData(e.getErrorCode(), e.getMessage());
}
}

@ApiOperation("签到")


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

@@ -12,7 +12,6 @@ import com.iformall.domain.po.WxCUser;
import com.iformall.domain.po.WxCreditHistory;
import com.iformall.domain.po.msg.WxMsgRecord;
import com.iformall.enums.*;
import com.iformall.exception.MallinkException;
import com.iformall.mapper.*;
import com.iformall.mq.MqBaseProducer;
import com.iformall.service.ExcelService;
@@ -147,7 +146,6 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService {
@Transactional(propagation = Propagation.REQUIRED, rollbackFor = {Exception.class})
@Override
public ResultData join(WxActivityJoin wxActivityJoin) {

WxActivityJoin joinQuery = new WxActivityJoin();
joinQuery.setUserId(wxActivityJoin.getUserId());
joinQuery.setActivityId(wxActivityJoin.getActivityId());
@@ -169,11 +167,7 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService {
wxCreditHistory.setCreditType(EnumScoreType.ACTIVITY_JOIN.getCode());
wxCreditHistory.setOperatorType(EnumUserType.CUSER.getCode());
wxCreditHistory.setOperatorId(wxActivityJoin.getUserId());
try {
wxCreditHistoryService.saveOrUpdate(wxCreditHistory);
} catch (MallinkException e) {
return new ResultData(e.getErrorCode(), e.getMessage());
}
wxCreditHistoryService.saveOrUpdate(wxCreditHistory);
}
//保存到报名表中
final IdWorker idWorker = IdWorker.get();


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