From c40be027ef8068b9a77bb24c94291dee25f563d8 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 19 八月 2021 09:28:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java | 107 ++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 77 insertions(+), 30 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java
index ab8e682..20210f7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java
@@ -53,6 +53,8 @@
@Resource
private ComActActSignDAO comActActSignDAO;
@Resource
+ private ComActEasyPhotoFeedbackMapper comActEasyPhotoFeedbackMapper;
+ @Resource
private ComActQuestnaireDAO comActQuestnaireDAO;
/**
* 分页查询随手拍
@@ -74,7 +76,7 @@
}
page.setSize(pageSize);
page.setCurrent(pageNum);
- IPage<ComActEasyPhotoVO> iPage = comActEasyPhotoDAO.pageEasyPhoto(page, comActEasyPhotoVO);
+ IPage<ComActEasyPhotoVO> iPage = comActEasyPhotoDAO.pageEasyPhotoAdmin(page, comActEasyPhotoVO);
List<ComActEasyPhotoVO> records = iPage.getRecords();
if (!ObjectUtils.isEmpty(records)) {
records.forEach(comActEasyPhotoVO1 -> {
@@ -133,12 +135,19 @@
}
}
- if (status.intValue()==4) {
- Date feedbackAt = comActEasyPhotoVO.getFeedbackAt();
- if (null==feedbackAt) {
- comActEasyPhotoVO.setFeedbackAt(comActEasyPhotoVO.getExamineAt());
- }
+// if (status.equals(4)) {
+// Date feedbackAt = comActEasyPhotoVO.getFeedbackAt();
+// if (null==feedbackAt) {
+// comActEasyPhotoVO.setFeedbackAt(comActEasyPhotoVO.getExamineAt());
+// }
+// }
+
+ //查询反馈信息
+ List<ComActEasyPhotoFeedbackVO> photoFeedbackList = comActEasyPhotoFeedbackMapper.getPhotoFeedbackList(id);
+ if(!photoFeedbackList.isEmpty()){
+ comActEasyPhotoVO.setPhotoFeedbackList(photoFeedbackList);
}
+
comActEasyPhotoVO.setPhone(SensitiveUtil.desensitizedPhoneNumber(comActEasyPhotoVO.getPhone()));
if(comActEasyPhotoVO.getAddrRemark()==null){
comActEasyPhotoVO.setAddrRemark("");
@@ -229,53 +238,91 @@
@Override
public R putEasypHotoStatus(ComActEasyPhotoVO comActEasyPhotoVO) {
Integer type = comActEasyPhotoVO.getType();
-// 操作类型 1审核通过 2驳回 3反馈
- ComActEasyPhotoDO cmActEasyPhotoDO=new ComActEasyPhotoDO();
- cmActEasyPhotoDO.setId(comActEasyPhotoVO.getId());
-// cmActEasyPhotoDO.setActivityType(comActEasyPhotoVO.getActivityType());
- Date date = new Date();
+ comActEasyPhotoVO.setIsNeedFeedBack(1);
+ Date nowDate = new Date();
+// 操作类型 1审核通过 2驳回 3反馈 4完成随手拍
+ ComActEasyPhotoDO cmActEasyPhotoDO = this.comActEasyPhotoDAO.selectById(comActEasyPhotoVO.getId());
+ if(cmActEasyPhotoDO == null){
+ return R.fail("未查询到随手拍记录");
+ }
switch (type){
case 1:
- cmActEasyPhotoDO = this.comActEasyPhotoDAO.selectById(comActEasyPhotoVO.getId());
if(!cmActEasyPhotoDO.getStatus().equals(ComActEasyPhotoDO.status.dsh)){
return R.fail("该随手拍已审核，不可重复操作");
}
- Integer isNeedFeedBack = comActEasyPhotoVO.getIsNeedFeedBack();
- if (isNeedFeedBack==1) {
- cmActEasyPhotoDO.setStatus(2);//进行中
- cmActEasyPhotoDO.setIsNeedFeedBack(1);
- }else{
- cmActEasyPhotoDO.setStatus(4);//已完成
- }
+ cmActEasyPhotoDO.setStatus(2);//进行中
+ cmActEasyPhotoDO.setIsNeedFeedBack(1);
cmActEasyPhotoDO.setHandlerId(comActEasyPhotoVO.getUserId());
- cmActEasyPhotoDO.setExamineAt(date);
+ cmActEasyPhotoDO.setExamineAt(nowDate);
cmActEasyPhotoDO.setActivityType(comActEasyPhotoVO.getActivityType());
+ if(StringUtils.isNotEmpty(comActEasyPhotoVO.getHandleResult()) || StringUtils.isNotEmpty(comActEasyPhotoVO.getHandlePhotoList())){
+ //说明此处有反馈,需要给随手拍新增反馈信息
+ ComActEasyPhotoFeedbackDO photoFeedbackDO = new ComActEasyPhotoFeedbackDO();
+ photoFeedbackDO.setEasyId(comActEasyPhotoVO.getId());
+ photoFeedbackDO.setFeedbackContent(comActEasyPhotoVO.getHandleResult());
+ photoFeedbackDO.setFeedbackImg(comActEasyPhotoVO.getHandlePhotoList());
+ photoFeedbackDO.setCreateAt(nowDate);
+ photoFeedbackDO.setCreateBy(comActEasyPhotoVO.getUserId());
+ comActEasyPhotoFeedbackMapper.insert(photoFeedbackDO);
+ }
+ //审核通过判断随手拍是否有活动并计算用户收益
+ comActUserWalletService.examineAddMoney(comActEasyPhotoVO.getActivityType(),comActEasyPhotoVO.getId(),comActEasyPhotoVO.getUserId(),BigDecimal.ZERO);
break;
case 2:
- cmActEasyPhotoDO = this.comActEasyPhotoDAO.selectById(comActEasyPhotoVO.getId());
if(!cmActEasyPhotoDO.getStatus().equals(ComActEasyPhotoDO.status.dsh)){
return R.fail("该随手拍已审核，不可重复操作");
}
cmActEasyPhotoDO.setHandlerId(comActEasyPhotoVO.getUserId());
cmActEasyPhotoDO.setStatus(3);//已驳回
- cmActEasyPhotoDO.setExamineAt(date);
+ cmActEasyPhotoDO.setExamineAt(nowDate);
cmActEasyPhotoDO.setRejectReason(comActEasyPhotoVO.getRejectReason());
break;
case 3:
- cmActEasyPhotoDO = this.comActEasyPhotoDAO.selectById(comActEasyPhotoVO.getId());
if(!cmActEasyPhotoDO.getStatus().equals(ComActEasyPhotoDO.status.dfk)){
return R.fail("该随手拍不是待反馈状态，不可进行反馈");
}
- cmActEasyPhotoDO.setHandlerId(comActEasyPhotoVO.getUserId());
- cmActEasyPhotoDO.setHandleResult(comActEasyPhotoVO.getHandleResult());
- cmActEasyPhotoDO.setHandlePhotoList(comActEasyPhotoVO.getHandlePhotoList());
- cmActEasyPhotoDO.setStatus(4);//已完成
- cmActEasyPhotoDO.setFeedbackAt(date);
+ //给随手拍新增反馈信息
+ ComActEasyPhotoFeedbackDO photoFeedbackDO = new ComActEasyPhotoFeedbackDO();
+ photoFeedbackDO.setEasyId(comActEasyPhotoVO.getId());
+ photoFeedbackDO.setFeedbackContent(comActEasyPhotoVO.getHandleResult());
+ photoFeedbackDO.setFeedbackImg(comActEasyPhotoVO.getHandlePhotoList());
+ photoFeedbackDO.setCreateAt(nowDate);
+ photoFeedbackDO.setCreateBy(comActEasyPhotoVO.getUserId());
+ comActEasyPhotoFeedbackMapper.insert(photoFeedbackDO);
+ break;
+ case 4:
+ if(cmActEasyPhotoDO.getStatus().equals(ComActEasyPhotoDO.status.ywc)){
+ return R.fail("该随手拍已完成，不可重复操作");
+ }
+ if(StringUtils.isNotEmpty(comActEasyPhotoVO.getHandleResult()) || StringUtils.isNotEmpty(comActEasyPhotoVO.getHandlePhotoList())){
+ //说明此处有反馈,需要给随手拍新增反馈信息
+ ComActEasyPhotoFeedbackDO photoFeedback = new ComActEasyPhotoFeedbackDO();
+ photoFeedback.setEasyId(comActEasyPhotoVO.getId());
+ photoFeedback.setFeedbackContent(comActEasyPhotoVO.getHandleResult());
+ photoFeedback.setFeedbackImg(comActEasyPhotoVO.getHandlePhotoList());
+ photoFeedback.setCreateAt(nowDate);
+ photoFeedback.setCreateBy(comActEasyPhotoVO.getUserId());
+ comActEasyPhotoFeedbackMapper.insert(photoFeedback);
+ }
+ if(cmActEasyPhotoDO.getStatus().equals(ComActEasyPhotoDO.status.dsh)){
+ cmActEasyPhotoDO.setExamineAt(nowDate);
+ cmActEasyPhotoDO.setHandlerId(comActEasyPhotoVO.getUserId());
+ cmActEasyPhotoDO.setActivityType(comActEasyPhotoVO.getActivityType());
+ //审核通过判断随手拍是否有活动并计算用户收益
+ comActUserWalletService.examineAddMoney(comActEasyPhotoVO.getActivityType(),comActEasyPhotoVO.getId(),comActEasyPhotoVO.getUserId(),BigDecimal.ZERO);
+ }
+ cmActEasyPhotoDO.setFeedbackAt(nowDate);
+ cmActEasyPhotoDO.setStatus(ComActEasyPhotoDO.status.ywc);
+ cmActEasyPhotoDO.setCompleteId(comActEasyPhotoVO.getUserId());
break;
default:break;
}
- int update = comActEasyPhotoDAO.updateById(cmActEasyPhotoDO);
- if (update>0) {
+ if(!type.equals(3)){
+ int update = comActEasyPhotoDAO.updateById(cmActEasyPhotoDO);
+ if (update>0) {
+ return R.ok();
+ }
+ }else{
return R.ok();
}
return R.fail();
--
Gitblit v1.7.1