From beacd47b5a174b52602a7c4e4ee431aef4ab48b2 Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期五, 11 十二月 2020 18:02:28 +0800
Subject: [PATCH] 社区动态社区活动微心愿随手拍部分接口测试完成
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
index 332387f..1b8d008 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
@@ -1,6 +1,7 @@
package com.panzhihua.service_community.api;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.service_community.model.dos.ComActActPrizeDO;
@@ -9,7 +10,6 @@
import com.panzhihua.service_community.service.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
-import org.springframework.data.domain.Page;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
@@ -51,7 +51,7 @@
@Transactional(rollbackFor = Exception.class)
public R addActivity(@RequestBody ComActActivityVO comActActivityVO) {
R r = comActActivityService.addActivity(comActActivityVO);
- boolean ok = r.isOk();
+ boolean ok = R.isOk(r);
if (ok) {
Long activityId = (Long) r.getData();
Integer hasPrize = comActActivityVO.getHasPrize();
@@ -72,8 +72,10 @@
}
}
+ }else {
+ return R.fail();
}
- return R.fail();
+ return R.ok();
}
/**
@@ -87,9 +89,10 @@
public R putActivity(@RequestBody ComActActivityVO comActActivityVO) {
R r = comActActivityService.putActivity(comActActivityVO);
List<ComActActPrizeVO> comActActPrizeVOList = comActActivityVO.getComActActPrizeVOList();
- boolean ok = r.isOk();
+ boolean ok = R.isOk(r);
if (ok) {
- if (!ObjectUtils.isEmpty(comActActPrizeVOList)) {
+ Integer hasPrize = comActActivityVO.getHasPrize();
+ if (!ObjectUtils.isEmpty(comActActPrizeVOList)&&hasPrize.intValue()==1) {
Long actActivityVOId = comActActivityVO.getId();
comActActPrizeService.remove(new QueryWrapper<ComActActPrizeDO>().lambda().eq(ComActActPrizeDO::getActivityId, actActivityVOId));
if (!ObjectUtils.isEmpty(comActActPrizeVOList)) {
@@ -120,6 +123,7 @@
public R deleteActivity(@RequestBody ComActActivityVO comActActivityVO) {
boolean remove = comActActivityService.removeById(comActActivityVO.getId());
if (remove) {
+ comActActPrizeService.remove(new QueryWrapper<ComActActPrizeDO>().lambda().eq(ComActActPrizeDO::getActivityId,comActActivityVO.getId()));
return R.ok();
}
return R.fail();
@@ -131,12 +135,12 @@
* @param comActActivityVO 查询参数
* @return 分页集合
*/
- @PostMapping("pageActivity")
+ @PostMapping("pageactivity")
public R pageActivity(@RequestBody ComActActivityVO comActActivityVO) {
R r = comActActivityService.pageActivity(comActActivityVO);
- if (r.isOk()) {
+ if (R.isOk(r)) {
Page<ComActActivityVO> page = (Page<ComActActivityVO>)r.getData();
- List<ComActActivityVO> content = page.getContent();
+ List<ComActActivityVO> content = page.getRecords();
if (!ObjectUtils.isEmpty(content)) {
List<ComActActPrizeVO> comActActPrizeVOList=new ArrayList<>();
content.forEach(comActActivityVO1 -> {
@@ -202,7 +206,7 @@
ActivitySignVO activitySignVO=new ActivitySignVO();
activitySignVO.setActivityId(id);
R r = comActActivityService.listActivitySign(activitySignVO);
- if (r.isOk()) {
+ if (R.isOk(r)) {
List<ActivitySignVO> activitySignVOS=(List<ActivitySignVO>)r.getData();
comActActivityVO.setActivitySignVOList(activitySignVOS);
}
@@ -272,7 +276,7 @@
if (!ObjectUtils.isEmpty(list)) {
int size = list.size();
if (size==4) {
- List<ComActDynDO> collect = list.stream().sorted(Comparator.comparing(ComActDynDO::getCreateAt)).collect(Collectors.toList());
+ List<ComActDynDO> collect = list.stream().sorted(Comparator.comparing(ComActDynDO::getUpdateAt)).collect(Collectors.toList());
ComActDynDO comActDynDO1 = collect.get(0);
comActDynDO1.setIsTopping(0);
boolean updateById = comActDynService.updateById(comActDynDO1);
--
Gitblit v1.7.1