From de91c84954157bb9f8b6d938cbe0b1b51fb6e65d Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期五, 07 五月 2021 15:23:57 +0800
Subject: [PATCH] bugfixed：新增便民服务商家 报错
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java | 170 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 154 insertions(+), 16 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java
index 891a740..6f31a02 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java
@@ -1,19 +1,26 @@
package com.panzhihua.service_community.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.community.ComActActivityVO;
import com.panzhihua.common.model.vos.community.ComActMicroWishVO;
+import com.panzhihua.common.model.vos.community.TodoEventsVO;
+import com.panzhihua.common.utlis.SensitiveUtil;
import com.panzhihua.service_community.dao.ComActMicroWishDAO;
+import com.panzhihua.service_community.dao.ComActMicroWishUserDAO;
import com.panzhihua.service_community.model.dos.ComActMicroWishDO;
+import com.panzhihua.service_community.model.dos.ComActMicroWishUserDO;
import com.panzhihua.service_community.service.ComActMicroWishService;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
import javax.annotation.Resource;
import java.util.Date;
+import java.util.List;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -22,9 +29,12 @@
* @create: 2020-12-07 14:34
**/
@Service
+@Slf4j
public class ComActMicroWishServiceImpl extends ServiceImpl<ComActMicroWishDAO, ComActMicroWishDO> implements ComActMicroWishService {
@Resource
private ComActMicroWishDAO comActMicroWishDAO;
+ @Resource
+ private ComActMicroWishUserDAO comActMicroWishUserDAO;
/**
* 分页查询微心愿
@@ -34,18 +44,35 @@
*/
@Override
public R pageMicroWish(ComActMicroWishVO comActMicroWishVO) {
+ Long userId = comActMicroWishVO.getResponsibleId();
Page page = new Page<>();
Long pageNum = comActMicroWishVO.getPageNum();
Long pageSize = comActMicroWishVO.getPageSize();
- if (ObjectUtils.isEmpty(pageNum) || 0 == pageNum) {
+ if (null==pageNum || 0 == pageNum) {
pageNum = 1l;
}
- if (ObjectUtils.isEmpty(pageSize) || 0 == pageSize) {
+ if (null==pageSize || 0 == pageSize) {
pageSize = 10l;
}
page.setSize(pageSize);
page.setCurrent(pageNum);
IPage<ComActMicroWishVO> iPage = comActMicroWishDAO.pageMicroWish(page, comActMicroWishVO);
+ List<ComActMicroWishVO> records = iPage.getRecords();
+ if (!ObjectUtils.isEmpty(records)) {
+ records.forEach(comActMicroWishVO1 -> {
+ Long id = comActMicroWishVO1.getId();
+ ComActMicroWishUserDO comActMicroWishUserDO = comActMicroWishUserDAO.selectOne(new QueryWrapper<ComActMicroWishUserDO>().lambda().eq(ComActMicroWishUserDO::getMicroWishId, id)
+ .eq(ComActMicroWishUserDO::getUserId, userId));
+ if (ObjectUtils.isEmpty(comActMicroWishUserDO)) {
+ comActMicroWishVO1.setHaveGiveThumbsUp(0);
+ } else {
+ comActMicroWishVO1.setHaveGiveThumbsUp(1);
+ }
+ comActMicroWishVO1.setSponsorPhone(SensitiveUtil.desensitizedPhoneNumber(comActMicroWishVO1.getSponsorPhone()));
+
+ });
+ iPage.setRecords(records);
+ }
return R.ok(iPage);
}
@@ -53,14 +80,29 @@
* 心愿详情
*
* @param id 查询主键
+ * @param userId 登录用户id
* @return 心愿内容
*/
@Override
- public R detailMicroWish(Long id) {
+ public R detailMicroWish(Long id, Long userId) {
ComActMicroWishVO comActMicroWishVO = comActMicroWishDAO.detailMicroWish(id);
if (ObjectUtils.isEmpty(comActMicroWishVO)) {
- return R.fail();
+ return R.fail("微心愿不存在");
}
+ Integer starNum = comActMicroWishVO.getStarNum();
+ if (null==starNum) {
+ comActMicroWishVO.setStarNum(0);
+ }
+ if (ObjectUtils.isEmpty(comActMicroWishVO)) {
+ return R.fail("心愿不存在");
+ }
+ ComActMicroWishUserDO comActMicroWishUserDO = comActMicroWishUserDAO.selectOne(new QueryWrapper<ComActMicroWishUserDO>().lambda().eq(ComActMicroWishUserDO::getUserId, userId).eq(ComActMicroWishUserDO::getMicroWishId, id));
+ if (ObjectUtils.isEmpty(comActMicroWishUserDO)) {
+ comActMicroWishVO.setHaveGiveThumbsUp(0);
+ }else {
+ comActMicroWishVO.setHaveGiveThumbsUp(1);
+ }
+ comActMicroWishVO.setSponsorPhone(SensitiveUtil.desensitizedPhoneNumber(comActMicroWishVO.getSponsorPhone()));
return R.ok(comActMicroWishVO);
}
@@ -73,44 +115,44 @@
@Override
public R putlMicroWish(ComActMicroWishVO comActMicroWishVO) {
Long id = comActMicroWishVO.getId();
- Integer type = comActMicroWishVO.getType();
- if (ObjectUtils.isEmpty(type)||type>5||type<1) {
- return R.fail("操作类型不对");
- }
+ int type = comActMicroWishVO.getType().intValue();
String rejectReason = comActMicroWishVO.getRejectReason();
Long responsibleId = comActMicroWishVO.getResponsibleId();
String feedback = comActMicroWishVO.getFeedback();
String feedbackPhotoPathList = comActMicroWishVO.getFeedbackPhotoPathList();
ComActMicroWishDO comActMicroWishDO=new ComActMicroWishDO();
comActMicroWishDO.setId(id);
+ Date date = new Date();
// 1 审核通过 2驳回 3分配人员 4发起活动 5反馈
switch (type){
case 1:
- comActMicroWishDO.setEvaluateAt(new Date());
+ comActMicroWishDO.setExamineAt(date);
comActMicroWishDO.setStatus(2);//待分配
break;
case 2:
- comActMicroWishDO.setEvaluateAt(new Date());
+ comActMicroWishDO.setExamineAt(date);
comActMicroWishDO.setRejectReason(rejectReason);
comActMicroWishDO.setStatus(4);//驳回
break;
case 3:
- comActMicroWishDO.setEvaluateAt(new Date());
+ comActMicroWishDO.setDistributionAt(date);
comActMicroWishDO.setResponsibleId(responsibleId);
comActMicroWishDO.setStatus(3);//进行中
comActMicroWishDO.setForm(1);
break;
case 4:
- comActMicroWishDO.setEvaluateAt(new Date());
+ comActMicroWishDO.setDistributionAt(date);
comActMicroWishDO.setResponsibleId(responsibleId);
- comActMicroWishDO.setStatus(3);//进行中
+ comActMicroWishDO.setStatus(3);//待确认
comActMicroWishDO.setForm(2);
-// todo 给负责人增加一个待办事件
break;
case 5:
- comActMicroWishDO.setEvaluateAt(new Date());
+ comActMicroWishDO.setFeedbackAt(date);
comActMicroWishDO.setStatus(5);//待确认
comActMicroWishDO.setFeedback(feedback);
+ comActMicroWishDO.setFinish(feedback);
+ comActMicroWishDO.setFinishPhotoPathList(feedbackPhotoPathList);
+ comActMicroWishDO.setFinishAt(date);
comActMicroWishDO.setFeedbackPhotoPathList(feedbackPhotoPathList);
break;
default:
@@ -122,4 +164,100 @@
}
return R.fail();
}
+
+ /**
+ * 点赞/取消点赞微心愿
+ *
+ * @param comActMicroWishVO 操作参数
+ * @return 操作结果
+ */
+ @Override
+ public R comActMicroWishVO(ComActMicroWishVO comActMicroWishVO) {
+ Integer haveGiveThumbsUp = comActMicroWishVO.getHaveGiveThumbsUp();
+ Long userId = comActMicroWishVO.getSponsorId();
+ Long microWishId = comActMicroWishVO.getId();
+ ComActMicroWishUserDO comActMicroWishUserDO = comActMicroWishUserDAO.selectOne(new QueryWrapper<ComActMicroWishUserDO>().lambda().eq(ComActMicroWishUserDO::getMicroWishId, microWishId).eq(ComActMicroWishUserDO::getUserId, userId));
+ boolean empty = ObjectUtils.isEmpty(comActMicroWishUserDO);
+ int num=0;
+ if (haveGiveThumbsUp.intValue()==1) {
+ if (empty) {
+ ComActMicroWishUserDO comActMicroWishUserDO1=new ComActMicroWishUserDO();
+ comActMicroWishUserDO1.setMicroWishId(microWishId);
+ comActMicroWishUserDO1.setUserId(userId);
+ num=comActMicroWishUserDAO.insert(comActMicroWishUserDO1);
+ }else{
+ return R.ok();
+ }
+ }else {
+ if (empty) {
+ return R.ok();
+ } else {
+ num= comActMicroWishUserDAO.deleteById(comActMicroWishUserDO.getId());
+ }
+ }
+ if (num>0) {
+ return R.ok();
+ }
+ return R.fail();
+ }
+
+ /**
+ * 用户确认心愿
+ *
+ * @param comActMicroWishVO 用户评价
+ * @return 确认结果
+ */
+ @Override
+ public R putMicroWishConfirm(ComActMicroWishVO comActMicroWishVO) {
+ ComActMicroWishDO comActMicroWishDO1 = comActMicroWishDAO.selectById(comActMicroWishVO.getId());
+ if (ObjectUtils.isEmpty(comActMicroWishDO1)) {
+ return R.fail("心愿不存在");
+ }
+ Integer status = comActMicroWishDO1.getStatus();
+ if (status.intValue()!=5) {
+ return R.fail("心愿状态不是待确认");
+ }
+ ComActMicroWishDO comActMicroWishDO=new ComActMicroWishDO();
+ comActMicroWishDO.setId(comActMicroWishVO.getId());
+ comActMicroWishDO.setEvaluateAt(comActMicroWishVO.getEvaluateAt());
+ comActMicroWishDO.setStatus(comActMicroWishVO.getStatus());
+ comActMicroWishDO.setScore(comActMicroWishVO.getScore());
+ comActMicroWishDO.setEvaluate(comActMicroWishVO.getEvaluate());
+ int update = comActMicroWishDAO.updateById(comActMicroWishDO);
+ if (update>0) {
+ return R.ok();
+ }
+ return R.fail();
+ }
+
+ /**
+ * 社区首页代办事件集合
+ *
+ * @param communityId 社区id
+ * @param userId 登录用户
+ * @return 代办事件集合
+ */
+ @Override
+ public List<TodoEventsVO> selectNeedToDo(Long communityId, Long userId) {
+ List<TodoEventsVO> todoEventsVOS=comActMicroWishDAO.selectNeedToDo(communityId,userId);
+ return todoEventsVOS;
+ }
+
+ @Override
+ public R deleteMicroWish(Long id) {
+ ComActMicroWishDO comActMicroWishDO = comActMicroWishDAO.selectById(id);
+ if(comActMicroWishDO==null){
+ return R.fail("id有误!");
+ }
+ comActMicroWishDAO.deleteById(id);
+ comActMicroWishUserDAO.delete(new LambdaQueryWrapper<ComActMicroWishUserDO>().eq(ComActMicroWishUserDO::getMicroWishId,id));
+ return R.ok();
+ }
+
+ @Override
+ public R timedTaskActMicroWishAll() {
+ int num=comActMicroWishDAO.updateStatusAutoConfirm();
+ log.info("定时任务--修改待自动确认微心愿状态数量【{}】",num);
+ return R.ok();
+ }
}
--
Gitblit v1.7.1