From 0bf174be571c53b8af796eca4b51fcd3edec1657 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期日, 25 四月 2021 21:55:43 +0800
Subject: [PATCH] no

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java |   23 ++++++++++++++++++++---
 1 files changed, 20 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..7aa1187 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,6 +8,7 @@
 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;
@@ -63,6 +65,8 @@
                 } else {
                     comActMicroWishVO1.setHaveGiveThumbsUp(1);
                 }
+                comActMicroWishVO1.setSponsorPhone(SensitiveUtil.desensitizedPhoneNumber(comActMicroWishVO1.getSponsorPhone()));
+
             });
             iPage.setRecords(records);
         }
@@ -79,6 +83,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 +99,7 @@
         }else {
             comActMicroWishVO.setHaveGiveThumbsUp(1);
         }
+        comActMicroWishVO.setSponsorPhone(SensitiveUtil.desensitizedPhoneNumber(comActMicroWishVO.getSponsorPhone()));
         return R.ok(comActMicroWishVO);
     }
 
@@ -131,8 +139,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 +240,14 @@
         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();
+    }
 }

--
Gitblit v1.7.1