From c3811d01d1929a98a0f34f70ca187d82ee312dbb Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期三, 03 十一月 2021 17:26:50 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java | 131 +++++++++++++++++++++++++++++++++++--------
1 files changed, 106 insertions(+), 25 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 6f776ae..6c89cb5 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
@@ -65,6 +65,10 @@
private ComActEasyPhotoFeedbackMapper comActEasyPhotoFeedbackMapper;
@Resource
private ComActQuestnaireDAO comActQuestnaireDAO;
+ @Resource
+ private ComActReserveMapper comActReserveMapper;
+ @Resource
+ private ComActActivityDAO comActActivityDAO;
/**
* 分页查询随手拍
@@ -284,10 +288,11 @@
cmActEasyPhotoDO.setIsReportUrban(ComActEasyPhotoVO.isReportUrban.yes);
cmActEasyPhotoDO.setTransferReason(comActEasyPhotoVO.getTransferReason());
cmActEasyPhotoDO.setTransferTime(nowDate);
+
} else {
cmActEasyPhotoDO.setIsReportUrban(ComActEasyPhotoVO.isReportUrban.no);
- cmActEasyPhotoDO.setHandlerId(comActEasyPhotoVO.getHandlerId());
}
+ cmActEasyPhotoDO.setHandlerId(comActEasyPhotoVO.getHandlerId());
cmActEasyPhotoDO.setExamineAt(nowDate);
cmActEasyPhotoDO.setActivityType(comActEasyPhotoVO.getActivityType());
if (StringUtils.isNotEmpty(comActEasyPhotoVO.getHandleResult())
@@ -352,6 +357,9 @@
cmActEasyPhotoDO.setFeedbackAt(nowDate);
cmActEasyPhotoDO.setStatus(ComActEasyPhotoDO.status.ywc);
cmActEasyPhotoDO.setCompleteId(comActEasyPhotoVO.getUserId());
+ if(comActEasyPhotoVO.getUrbanStatus()!=null&&comActEasyPhotoVO.getUrbanStatus()==2){
+ cmActEasyPhotoDO.setUrbanStatus(2);
+ }
break;
default:
break;
@@ -611,23 +619,111 @@
*/
@Override
public R getUserReward(Long userId, Long communityId) {
+// // 结果返回参数
+// ComActEasyPhotoRewardVO easyPhotoRewardVO = new ComActEasyPhotoRewardVO();
+// // 查询随手拍活动
+// ComActEasyPhotoActivityVO photoActivityVO = new ComActEasyPhotoActivityVO();
+// Date nowDate = DateUtils.getCurrentDate(DateUtils.ymdhms_format);
+// List<ComActEasyPhotoActivityDO> photoActivityDOS =
+// comActEasyPhotoActivityMapper.selectList(new QueryWrapper<ComActEasyPhotoActivityDO>().lambda()
+// .eq(ComActEasyPhotoActivityDO::getCommunityId, communityId)
+// .eq(ComActEasyPhotoActivityDO::getStatus, ComActEasyPhotoActivityDO.status.jxz)
+// .le(ComActEasyPhotoActivityDO::getActivityStartAt, nowDate)
+// .ge(ComActEasyPhotoActivityDO::getActivityEndAt, nowDate));
+// if (!photoActivityDOS.isEmpty()) {
+// ComActEasyPhotoActivityDO photoActivityDO = photoActivityDOS.get(0);
+// BeanUtils.copyProperties(photoActivityDO, photoActivityVO);
+// easyPhotoRewardVO.setEasyPhotoActivityVO(photoActivityVO);
+// }
+//
+// if (userId != null && userId != 0L) {
+// // 查询用户未读奖励金额
+// BigDecimal amount = comActEasyPhotoRewardMapper.getUserReward(userId, communityId);
+// if (amount != null) {
+// easyPhotoRewardVO.setAmount(amount);
+// }
+// }
+//
+// // 查询当前社区正在进行中的弹窗调查问卷
+// ComActQuestnaireDO popupQuestnaireDO = comActQuestnaireDAO.selectOne(new QueryWrapper<ComActQuestnaireDO>()
+// .lambda().le(ComActQuestnaireDO::getStartTime, nowDate).ge(ComActQuestnaireDO::getEndTime, nowDate)
+// .eq(ComActQuestnaireDO::getCommunityId, communityId).eq(ComActQuestnaireDO::getState, 2)
+// .eq(ComActQuestnaireDO::getAdverPositionPopup, ComActQuestnaireDO.isOk.yes));
+// if (popupQuestnaireDO != null) {
+// ComActQuestnaireAppVO popupQuestnaireVO = new ComActQuestnaireAppVO();
+// BeanUtils.copyProperties(popupQuestnaireDO, popupQuestnaireVO);
+// if (userId != null) {
+// if (popupQuestnaireDO.getIsForce().equals(ComActQuestnaireDO.isOk.no)) {
+// // 查询用户是否已点击不再提醒
+// Integer count = comActQuestnaireDAO.getNoRemindCount(userId, popupQuestnaireVO.getId());
+// if (count <= 0) {
+// popupQuestnaireVO.setIsDisplay(ComActQuestnaireDO.isOk.yes);
+// }
+// } else {
+// popupQuestnaireVO.setIsDisplay(ComActQuestnaireDO.isOk.yes);
+// }
+// }
+// easyPhotoRewardVO.setPopupQuestnaireVO(popupQuestnaireVO);
+// }
+//
+// // 查询社区正在进行中的banner位置调查问卷列表
+// List<ComActQuestnaireAppVO> bannerQuestnaireList = comActQuestnaireDAO.getIndexTopQuestnaireList(communityId);
+// if (!bannerQuestnaireList.isEmpty()) {
+// easyPhotoRewardVO.setBannerQuestnaireList(bannerQuestnaireList);
+// }
+//
+// //查询社区正在进行中的banner位置的社区活动
+// List<ComActActivityVO> comActActivityVOList = comActActivityDAO.getIndexTopActivityList(communityId);
+// if (!comActActivityVOList.isEmpty()) {
+// easyPhotoRewardVO.setBannerActivityList(comActActivityVOList);
+// }
+//
+// // 查询社区正在进行中的应用位置调查问卷列表
+// List<ComActQuestnaireAppVO> applicationQuestnaireList =
+// comActQuestnaireDAO.getIndexApplicationQuestnaireList(communityId);
+// if (!applicationQuestnaireList.isEmpty()) {
+// easyPhotoRewardVO.setApplicationQuestnaireList(applicationQuestnaireList);
+// }
+// //查询社区正在进行中的banner预约/登记列表
+// List<ComActReserveIndexVo> comActReserveIndexVos=comActReserveMapper.indexBanner(communityId);
+// if(!comActReserveIndexVos.isEmpty()){
+// easyPhotoRewardVO.setComActReserveIndexBannerVos(comActReserveIndexVos);
+// }
+// //查询社区正在进行中的应用预约/登记列表
+// List<ComActReserveIndexVo> comActReserveIndexApplicationVos=comActReserveMapper.indexApplication(communityId);
+// if(!comActReserveIndexApplicationVos.isEmpty()){
+// easyPhotoRewardVO.setComActReserveIndexApplicationVos(comActReserveIndexApplicationVos);
+// }
+ return R.ok(this.comActEasyPhotoDAO.banner(communityId));
+ }
+
+ /**
+ * 获取首页弹窗接口
+ *
+ * @param userId
+ * 用户id
+ * @param communityId
+ * 社区id
+ * @return 首页弹窗接口
+ */
+ @Override
+ public R getUserRewards(Long userId, Long communityId) {
// 结果返回参数
ComActEasyPhotoRewardVO easyPhotoRewardVO = new ComActEasyPhotoRewardVO();
// 查询随手拍活动
ComActEasyPhotoActivityVO photoActivityVO = new ComActEasyPhotoActivityVO();
Date nowDate = DateUtils.getCurrentDate(DateUtils.ymdhms_format);
List<ComActEasyPhotoActivityDO> photoActivityDOS =
- comActEasyPhotoActivityMapper.selectList(new QueryWrapper<ComActEasyPhotoActivityDO>().lambda()
- .eq(ComActEasyPhotoActivityDO::getCommunityId, communityId)
- .eq(ComActEasyPhotoActivityDO::getStatus, ComActEasyPhotoActivityDO.status.jxz)
- .le(ComActEasyPhotoActivityDO::getActivityStartAt, nowDate)
- .ge(ComActEasyPhotoActivityDO::getActivityEndAt, nowDate));
+ comActEasyPhotoActivityMapper.selectList(new QueryWrapper<ComActEasyPhotoActivityDO>().lambda()
+ .eq(ComActEasyPhotoActivityDO::getCommunityId, communityId)
+ .eq(ComActEasyPhotoActivityDO::getStatus, ComActEasyPhotoActivityDO.status.jxz)
+ .le(ComActEasyPhotoActivityDO::getActivityStartAt, nowDate)
+ .ge(ComActEasyPhotoActivityDO::getActivityEndAt, nowDate));
if (!photoActivityDOS.isEmpty()) {
ComActEasyPhotoActivityDO photoActivityDO = photoActivityDOS.get(0);
BeanUtils.copyProperties(photoActivityDO, photoActivityVO);
easyPhotoRewardVO.setEasyPhotoActivityVO(photoActivityVO);
}
-
if (userId != null && userId != 0L) {
// 查询用户未读奖励金额
BigDecimal amount = comActEasyPhotoRewardMapper.getUserReward(userId, communityId);
@@ -635,12 +731,11 @@
easyPhotoRewardVO.setAmount(amount);
}
}
-
// 查询当前社区正在进行中的弹窗调查问卷
ComActQuestnaireDO popupQuestnaireDO = comActQuestnaireDAO.selectOne(new QueryWrapper<ComActQuestnaireDO>()
- .lambda().le(ComActQuestnaireDO::getStartTime, nowDate).ge(ComActQuestnaireDO::getEndTime, nowDate)
- .eq(ComActQuestnaireDO::getCommunityId, communityId).eq(ComActQuestnaireDO::getState, 2)
- .eq(ComActQuestnaireDO::getAdverPositionPopup, ComActQuestnaireDO.isOk.yes));
+ .lambda().le(ComActQuestnaireDO::getStartTime, nowDate).ge(ComActQuestnaireDO::getEndTime, nowDate)
+ .eq(ComActQuestnaireDO::getCommunityId, communityId).eq(ComActQuestnaireDO::getState, 2)
+ .eq(ComActQuestnaireDO::getAdverPositionPopup, ComActQuestnaireDO.isOk.yes));
if (popupQuestnaireDO != null) {
ComActQuestnaireAppVO popupQuestnaireVO = new ComActQuestnaireAppVO();
BeanUtils.copyProperties(popupQuestnaireDO, popupQuestnaireVO);
@@ -657,20 +752,6 @@
}
easyPhotoRewardVO.setPopupQuestnaireVO(popupQuestnaireVO);
}
-
- // 查询社区正在进行中的banner位置调查问卷列表
- List<ComActQuestnaireAppVO> bannerQuestnaireList = comActQuestnaireDAO.getIndexTopQuestnaireList(communityId);
- if (!bannerQuestnaireList.isEmpty()) {
- easyPhotoRewardVO.setBannerQuestnaireList(bannerQuestnaireList);
- }
-
- // 查询社区正在进行中的应用位置调查问卷列表
- List<ComActQuestnaireAppVO> applicationQuestnaireList =
- comActQuestnaireDAO.getIndexApplicationQuestnaireList(communityId);
- if (!applicationQuestnaireList.isEmpty()) {
- easyPhotoRewardVO.setApplicationQuestnaireList(applicationQuestnaireList);
- }
-
return R.ok(easyPhotoRewardVO);
}
--
Gitblit v1.7.1