springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java
@@ -2,7 +2,9 @@ import javax.annotation.Resource; import com.panzhihua.common.model.dtos.common.EvaluateEasyDto; import com.panzhihua.common.model.vos.community.easyPhoto.BannerVO; import com.panzhihua.common.service.community.ComActEasyPhotoEvaluateFeign; import org.springframework.util.ObjectUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -49,6 +51,8 @@ private UserService userService; @Resource private CheckService checkService; @Resource private ComActEasyPhotoEvaluateFeign easyPhotoEvaluateFeign; @ApiOperation(value = "分页展示社区随手拍", response = ComActEasyPhotoVO.class) @PostMapping("pageeasyphoto") @@ -379,4 +383,11 @@ public R easyPhotoClassifyList() { return communityService.listPhotoClassify(this.getAreaCode()); } @ApiOperation(value = "随手拍评价") @PostMapping("easyphoto/whistle/evaluate") public R evaluateEasyPhotoWhistle(@RequestBody EvaluateEasyDto whistleDto) { whistleDto.setUserId(this.getUserId()); return easyPhotoEvaluateFeign.evaluateEasyApplets(whistleDto); } } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/common/EvaluateEasyDto.java
New file @@ -0,0 +1,26 @@ package com.panzhihua.common.model.dtos.common; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** * @author lyq * 随手拍、微心愿评价请求参数 */ @Data @ApiModel("随手拍、微心愿评价请求参数") public class EvaluateEasyDto { @ApiModelProperty(value = "id") private Long id; @ApiModelProperty(value = "用户id",hidden = true) private Long userId; @ApiModelProperty(value = "评论内容") private String content; @ApiModelProperty(value = "评分") private Integer score; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComActEasyPhotoEvaluateFeign.java
@@ -74,4 +74,12 @@ @GetMapping("/detail") R detailById(@RequestParam("id") Long id); /** * 随手拍评价 * @param whistleDto 请求参数 * @return 评价结果 */ @PostMapping("/easy/evaluate") R evaluateEasyApplets(@RequestBody EvaluateEasyDto whistleDto); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActEasyPhotoEvaluateController.java
@@ -102,5 +102,10 @@ return this.comActEasyPhotoEvaluateService.queryByList(comActEasyPhotoEvaluate); } @PostMapping("/easy/evaluate") public R evaluateEasyApplets(@RequestBody EvaluateEasyDto whistleDto){ return this.comActEasyPhotoEvaluateService.evaluateEasyApplets(whistleDto); } }
@@ -47,6 +47,13 @@ */ private Integer serviceType; /** * 业务分类（1.随手拍 2.微心愿） */ public interface ServiceType{ int SSP = 1; int WXY = 2; } }
@@ -197,12 +197,13 @@ } /** * 状态 1待审核 2进行中 3已驳回 4已完成 * 状态 1待审核 2进行中 3已驳回 4待评价 5.已完成 */ public interface status { int dsh = 1; int dfk = 2; int ybh = 3; int ywc = 4; int dpj = 4; int ywc = 5; } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActMicroWishOperationRecordDO.java
@@ -74,7 +74,7 @@ '}'; } /** *操作类型 1已提交 2审核通过 3 驳回 4完成集心 5 分配 6 完成 7反馈 8系统自动确认 *操作类型 1已提交 2审核通过 3 驳回 4完成集心 5 分配 6 完成 7反馈 8系统自动确认 9评价 */ public interface type{ int ytj=1; @@ -85,5 +85,6 @@ int wc=6; int fk=7; int zd=8; int pj = 9; } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActEasyPhotoEvaluateService.java
@@ -2,6 +2,9 @@ import com.panzhihua.common.model.dtos.common.*; import com.panzhihua.common.model.vos.R; import org.springframework.web.bind.annotation.RequestBody; import java.util.Date; /** * title: 随手拍、微心愿评价表表服务接口 @@ -75,4 +78,17 @@ */ R queryByList(PageComActEasyPhotoEvaluateDto comActEasyPhotoEvaluate); R evaluateEasyApplets(EvaluateEasyDto whistleDto); /** * 添加随手拍、微心愿评价记录 * @param communityId 社区id * @param userId 用户id * @param serviceId 业务记录id * @param score 评价分数 * @param content 评价内容 * @param nowDate 评价时间 * @param serviceType 业务类型（1.随手拍 2.微心愿） */ void addEasyPhotoEvaluateRecord(Long communityId, Long userId, Long serviceId, Integer score, String content, Date nowDate,Integer serviceType); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoEvaluateServiceImpl.java
@@ -1,14 +1,24 @@ package com.panzhihua.service_community.service.impl; import com.panzhihua.service_community.dao.ComActEasyPhotoDAO; import com.panzhihua.service_community.dao.ComActMicroWishDAO; import com.panzhihua.service_community.entity.ComActEasyPhotoEvaluate; import com.panzhihua.service_community.dao.ComActEasyPhotoEvaluateMapper; import com.panzhihua.service_community.model.dos.ComActEasyPhotoDO; import com.panzhihua.service_community.model.dos.ComActMicroWishDO; import com.panzhihua.service_community.service.ComActEasyPhotoEvaluateService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.panzhihua.service_community.service.ComActMicroWishOperationRecordService; import com.panzhihua.service_community.service.ComActMicroWishService; import org.springframework.beans.BeanUtils; import com.panzhihua.common.model.dtos.common.*; import com.panzhihua.common.model.vos.R; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Date; /** * title: 随手拍、微心愿评价表表服务实现类 @@ -22,6 +32,13 @@ */ @Service("comActEasyPhotoEvaluateService") public class ComActEasyPhotoEvaluateServiceImpl extends ServiceImpl<ComActEasyPhotoEvaluateMapper, ComActEasyPhotoEvaluate> implements ComActEasyPhotoEvaluateService { @Resource private ComActEasyPhotoDAO easyPhotoDAO; @Resource private ComActMicroWishDAO microWishDAO; @Resource private ComActMicroWishOperationRecordService microWishOperationRecordService; /** * description queryByPage 分页查询 @@ -116,4 +133,48 @@ public R queryByList(PageComActEasyPhotoEvaluateDto comActEasyPhotoEvaluate) { return R.ok(this.baseMapper.queryAllByList(comActEasyPhotoEvaluate)); } @Override @Transactional(rollbackFor = Exception.class) public R evaluateEasyApplets(EvaluateEasyDto whistleDto) { ComActEasyPhotoDO easyPhotoDO = easyPhotoDAO.selectById(whistleDto.getId()); if(easyPhotoDO == null){ return R.fail("未查询到该记录"); } if(!easyPhotoDO.getStatus().equals(ComActEasyPhotoDO.status.dpj)){ return R.fail("当前状态不可进行评价"); } Date nowDate = new Date(); //新增评价记录 this.addEasyPhotoEvaluateRecord(easyPhotoDO.getCommunityId(),whistleDto.getUserId(),easyPhotoDO.getId(),whistleDto.getScore() ,whistleDto.getContent(),nowDate,ComActEasyPhotoEvaluate.ServiceType.SSP); //更新随手拍状态 easyPhotoDO.setStatus(ComActEasyPhotoDO.status.ywc); easyPhotoDO.setEvaluateDate(nowDate); easyPhotoDAO.updateById(easyPhotoDO); return R.ok(); } /** * 添加随手拍、微心愿评价记录 * @param communityId 社区id * @param userId 用户id * @param serviceId 业务记录id * @param score 评价分数 * @param content 评价内容 * @param nowDate 评价时间 * @param serviceType 业务类型（1.随手拍 2.微心愿） */ @Override public void addEasyPhotoEvaluateRecord(Long communityId, Long userId, Long serviceId, Integer score, String content, Date nowDate, Integer serviceType) { ComActEasyPhotoEvaluate easyPhotoEvaluate = new ComActEasyPhotoEvaluate(); easyPhotoEvaluate.setCommunityId(communityId); easyPhotoEvaluate.setUserId(userId); easyPhotoEvaluate.setServiceId(serviceId); easyPhotoEvaluate.setScore(score); easyPhotoEvaluate.setContent(content); easyPhotoEvaluate.setCreateAt(nowDate); easyPhotoEvaluate.setServiceType(serviceType); this.baseMapper.insert(easyPhotoEvaluate); } }
