From 51e8123d8e1c37a719346e5cd112d2480cac52c9 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期六, 04 九月 2021 11:08:09 +0800
Subject: [PATCH] bug修复
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java | 43 +++++++++++++++++++++++++++----------------
1 files changed, 27 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 493fd17..6a8d37f 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
@@ -121,16 +121,14 @@
}
}
//查询反馈列表
- if(comActMicroWishVO.getStatus()==5||comActMicroWishVO.getStatus()==6){
- List<ComActMicroWishFeedbackVO> list=comActMicroWishFeedbackMapper.selectByWishId(id);
- if(!list.isEmpty()){
- comActMicroWishVO.setFeedbackVOList(list);
- }
+ List<ComActMicroWishFeedbackVO> feedList=comActMicroWishFeedbackMapper.selectByWishId(id);
+ if(!feedList.isEmpty()){
+ comActMicroWishVO.setFeedbackVOList(feedList);
}
//查询操作记录
- List<ComActMicroWishOperationRecordVO> list=comActMicroWishOperationRecordMapper.getByWishId(id);
- if(!list.isEmpty()){
- comActMicroWishVO.setOperationRecordVOList(list);
+ List<ComActMicroWishOperationRecordVO> operationList=comActMicroWishOperationRecordMapper.getByWishId(id);
+ if(!operationList.isEmpty()){
+ comActMicroWishVO.setOperationRecordVOList(operationList);
}
comActMicroWishVO.setSponsorPhone(SensitiveUtil.desensitizedPhoneNumber(comActMicroWishVO.getSponsorPhone()));
//查询同类型id数组
@@ -163,9 +161,16 @@
comActMicroWishOperationRecordDO.setCreateTime(date);
comActMicroWishOperationRecordDO.setUserId(comActMicroWishVO.getUserId());
comActMicroWishOperationRecordDO.setWishId(comActMicroWishVO.getId());
+ ComActMicroWishDO microWishDO = this.baseMapper.selectById(id);
+ if(microWishDO == null){
+ return R.fail("未查询到该微心愿记录");
+ }
// 1 审核通过 2驳回 3分配人员 4发起活动 5反馈
switch (type){
case 1:
+ if(!microWishDO.getStatus().equals(ComActMicroWishDO.status.dsh)){
+ return R.fail("该微心愿已审核，不可重复审核");
+ }
comActMicroWishDO.setExamineAt(date);
comActMicroWishDO.setAimNum(comActMicroWishVO.getAimNum());
comActMicroWishDO.setStatus(7);//集心中
@@ -174,11 +179,14 @@
comActMicroWishOperationRecordMapper.insert(comActMicroWishOperationRecordDO);
break;
case 2:
+ if(!microWishDO.getStatus().equals(ComActMicroWishDO.status.dsh)){
+ return R.fail("该微心愿已审核，不可重复审核");
+ }
comActMicroWishDO.setExamineAt(date);
comActMicroWishDO.setRejectReason(rejectReason);
comActMicroWishDO.setStatus(4);//驳回
comActMicroWishOperationRecordDO.setType(ComActMicroWishOperationRecordDO.type.bh);
- comActMicroWishOperationRecordDO.setContent("审核未通过");
+ comActMicroWishOperationRecordDO.setContent(rejectReason);
comActMicroWishOperationRecordMapper.insert(comActMicroWishOperationRecordDO);
break;
case 3:
@@ -204,14 +212,17 @@
comActMicroWishFeedbackDO.setImgUrl(feedbackPhotoPathList);
comActMicroWishFeedbackDO.setMicroId(comActMicroWishVO.getId());
comActMicroWishFeedbackDO.setUserId(comActMicroWishVO.getUserId());
- if(comActMicroWishVO.getStatus().equals(ComActMicroWishDO.status.ywc)){
+ if(comActMicroWishVO.getStatus() != null && comActMicroWishVO.getStatus().equals(ComActMicroWishDO.status.ywc)){
comActMicroWishDO.setStatus(comActMicroWishVO.getStatus());
+ comActMicroWishDO.setFinishAt(date);
+ comActMicroWishDO.setFinish(feedback);
+ comActMicroWishDO.setFinishPhotoPathList(feedbackPhotoPathList);
}
- else {
- comActMicroWishDO.setStatus(5);
- }
+// else {
+// comActMicroWishDO.setStatus(3);
+// }
comActMicroWishFeedbackMapper.insert(comActMicroWishFeedbackDO);
- break;
+ return R.ok();
default:
break;
}
@@ -275,8 +286,8 @@
return R.fail("心愿不存在");
}
Integer status = comActMicroWishDO1.getStatus();
- if (status.intValue()!=5) {
- return R.fail("心愿状态不是待确认");
+ if (!status.equals(ComActMicroWishDO.status.ywc)) {
+ return R.fail("心愿状态不是已完成状态");
}
ComActMicroWishDO comActMicroWishDO=new ComActMicroWishDO();
comActMicroWishDO.setId(comActMicroWishVO.getId());
--
Gitblit v1.7.1