From b92edf56e7e25440e7c46b967aa5373a7a8b25c2 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期一, 14 三月 2022 09:22:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 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 0dfad0a..bd3e305 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
@@ -7,6 +7,13 @@
import javax.annotation.Resource;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.panzhihua.common.model.dtos.common.PageComActEasyPhotoEvaluateDto;
+import com.panzhihua.common.model.vos.community.easyPhoto.BannerVO;
+import com.panzhihua.service_community.entity.ComActEasyPhotoEvaluate;
+import com.panzhihua.service_community.entity.ComActEasyPhotoHandler;
+import com.panzhihua.service_community.entity.SysTemplateConfig;
+import com.panzhihua.service_community.service.ComActEasyPhotoHandlerService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -69,7 +76,12 @@
private ComActReserveMapper comActReserveMapper;
@Resource
private ComActActivityDAO comActActivityDAO;
-
+ @Resource
+ private SysTemplateConfigDao sysTemplateConfigDao;
+ @Resource
+ private ComActEasyPhotoHandlerService easyPhotoHandlerService;
+ @Resource
+ private ComActEasyPhotoEvaluateMapper comActEasyPhotoEvaluateMapper;
/**
* 分页查询随手拍
*
@@ -185,6 +197,10 @@
comActEasyPhotoVO.setEasyPhotoActivityVO(easyPhotoActivityVO);
}
}
+ PageComActEasyPhotoEvaluateDto evaluateDto = new PageComActEasyPhotoEvaluateDto();
+ evaluateDto.setServiceId(id);
+ evaluateDto.setServiceType(ComActEasyPhotoEvaluate.ServiceType.SSP);
+ comActEasyPhotoVO.setEvaluateList(comActEasyPhotoEvaluateMapper.queryAllByList(evaluateDto));
return R.ok(comActEasyPhotoVO);
}
@@ -309,6 +325,14 @@
// 审核通过判断随手拍是否有活动并计算用户收益
comActUserWalletService.examineAddMoney(comActEasyPhotoVO.getActivityType(), comActEasyPhotoVO.getId(),
comActEasyPhotoVO.getUserId(), BigDecimal.ZERO);
+
+ //添加分配人员
+ if(comActEasyPhotoVO.getHandleList() != null && comActEasyPhotoVO.getHandleList().size() > 0){
+ comActEasyPhotoVO.getHandleList().forEach(handle -> {
+ easyPhotoHandlerService.addHandleRecord(cmActEasyPhotoDO.getCommunityId(),comActEasyPhotoVO.getUserId()
+ ,cmActEasyPhotoDO.getId(),handle.getType(), ComActEasyPhotoHandler.ServiceType.SSP);
+ });
+ }
break;
case 2:
// if(!cmActEasyPhotoDO.getStatus().equals(ComActEasyPhotoDO.status.dsh)){
@@ -595,10 +619,11 @@
Map<String, String> map = comActActSignDAO.getUserOpenId(easyPhotoDO.getSponsorId());
if (map != null) {
String openid = map.get("openid");
+ SysTemplateConfig sysTemplateConfig=sysTemplateConfigDao.selectOne(new QueryWrapper<SysTemplateConfig>().lambda().eq(SysTemplateConfig::getAreaCode, grantRewardDTO.getAreaCode()).eq(SysTemplateConfig::getType,7));
WxXCXTempSend util = new WxXCXTempSend();
try {
WxUtil.sendSubscribeJLDZ(openid, util.getAppAccessToken(), "随手拍有奖活动",
- grantRewardDTO.getAmount(), activityType);
+ grantRewardDTO.getAmount(), activityType,sysTemplateConfig.getTemplateId());
} catch (Exception e) {
log.error("消息推送失败，失败原因：" + e.getMessage());
}
@@ -694,6 +719,11 @@
if(!comActReserveIndexApplicationVos.isEmpty()){
easyPhotoRewardVO.setComActReserveIndexApplicationVos(comActReserveIndexApplicationVos);
}
+ //查询banner
+ List<BannerVO> bannerVOS=this.comActEasyPhotoDAO.banner(communityId);
+ if(!bannerVOS.isEmpty()){
+ easyPhotoRewardVO.setBannerVOS(bannerVOS);
+ }
return R.ok(easyPhotoRewardVO);
}
--
Gitblit v1.7.1