From 54ad966d0b142c97fc659263b51d1ea5d7b5c7c6 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 28 五月 2021 16:17:08 +0800
Subject: [PATCH] 修改bug
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java | 33 ++++++++++++++++++++++++++++++---
1 files changed, 30 insertions(+), 3 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 43cba98..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,5 +1,6 @@
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;
@@ -7,11 +8,13 @@
import com.panzhihua.common.model.vos.R;
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;
@@ -26,6 +29,7 @@
* @create: 2020-12-07 14:34
**/
@Service
+@Slf4j
public class ComActMicroWishServiceImpl extends ServiceImpl<ComActMicroWishDAO, ComActMicroWishDO> implements ComActMicroWishService {
@Resource
private ComActMicroWishDAO comActMicroWishDAO;
@@ -57,12 +61,15 @@
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));
+ 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);
}
@@ -79,6 +86,9 @@
@Override
public R detailMicroWish(Long id, Long userId) {
ComActMicroWishVO comActMicroWishVO = comActMicroWishDAO.detailMicroWish(id);
+ if (ObjectUtils.isEmpty(comActMicroWishVO)) {
+ return R.fail("微心愿不存在");
+ }
Integer starNum = comActMicroWishVO.getStarNum();
if (null==starNum) {
comActMicroWishVO.setStarNum(0);
@@ -92,6 +102,7 @@
}else {
comActMicroWishVO.setHaveGiveThumbsUp(1);
}
+ comActMicroWishVO.setSponsorPhone(SensitiveUtil.desensitizedPhoneNumber(comActMicroWishVO.getSponsorPhone()));
return R.ok(comActMicroWishVO);
}
@@ -131,8 +142,8 @@
break;
case 4:
comActMicroWishDO.setDistributionAt(date);
- comActMicroWishDO.setResponsibleId(null);
- comActMicroWishDO.setStatus(5);//待确认
+ comActMicroWishDO.setResponsibleId(responsibleId);
+ comActMicroWishDO.setStatus(3);//待确认
comActMicroWishDO.setForm(2);
break;
case 5:
@@ -232,5 +243,21 @@
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