From 8a6375edade9f1edc194a0381369fe94e56c13c7 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期五, 13 八月 2021 13:16:36 +0800
Subject: [PATCH] Merge branch 'txb'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java | 101 +++++++++++++++++++++++++++++++++-----------------
1 files changed, 66 insertions(+), 35 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 530476d..a98908f 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
@@ -10,9 +10,7 @@
import com.panzhihua.common.model.dtos.community.ComActEasyPhotoCommentUserDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.*;
-import com.panzhihua.common.utlis.DateUtils;
-import com.panzhihua.common.utlis.SensitiveUtil;
-import com.panzhihua.common.utlis.StringUtils;
+import com.panzhihua.common.utlis.*;
import com.panzhihua.service_community.dao.*;
import com.panzhihua.service_community.model.dos.*;
import com.panzhihua.service_community.service.ComActEasyPhotoService;
@@ -27,6 +25,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Map;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -51,6 +50,8 @@
private ComActEasyPhotoRewardMapper comActEasyPhotoRewardMapper;
@Resource
private ComActUserWalletService comActUserWalletService;
+ @Resource
+ private ComActActSignDAO comActActSignDAO;
/**
* 分页查询随手拍
*
@@ -87,15 +88,17 @@
if(comActEasyPhotoVO1.getActivityId() != null && comActEasyPhotoVO1.getStatus().equals(ComActEasyPhotoDO.status.ywc)){
//查询随手拍活动
ComActEasyPhotoActivityDO photoActivityDO = comActEasyPhotoActivityMapper.selectById(comActEasyPhotoVO1.getActivityId());
- if(comActEasyPhotoVO1.getActivityType() != null){
- if(comActEasyPhotoVO1.getActivityType().equals(ComActEasyPhotoDO.activityType.yz)){
- comActEasyPhotoVO1.setActivityMoney(photoActivityDO.getGoodReward());
- }else if(comActEasyPhotoVO1.getActivityType().equals(ComActEasyPhotoDO.activityType.jl)){
- comActEasyPhotoVO1.setActivityMoney(photoActivityDO.getExcellentReward());
- }else if(comActEasyPhotoVO1.getActivityType().equals(ComActEasyPhotoDO.activityType.pt)){
- comActEasyPhotoVO1.setActivityMoney(photoActivityDO.getOrdinaryReward());
- }else if(comActEasyPhotoVO1.getActivityType().equals(ComActEasyPhotoDO.activityType.yb)){
- comActEasyPhotoVO1.setActivityMoney(photoActivityDO.getCommonlyReward());
+ if(photoActivityDO != null){
+ if(comActEasyPhotoVO1.getActivityType() != null){
+ if(comActEasyPhotoVO1.getActivityType().equals(ComActEasyPhotoDO.activityType.yz)){
+ comActEasyPhotoVO1.setActivityMoney(photoActivityDO.getGoodReward());
+ }else if(comActEasyPhotoVO1.getActivityType().equals(ComActEasyPhotoDO.activityType.jl)){
+ comActEasyPhotoVO1.setActivityMoney(photoActivityDO.getExcellentReward());
+ }else if(comActEasyPhotoVO1.getActivityType().equals(ComActEasyPhotoDO.activityType.pt)){
+ comActEasyPhotoVO1.setActivityMoney(photoActivityDO.getOrdinaryReward());
+ }else if(comActEasyPhotoVO1.getActivityType().equals(ComActEasyPhotoDO.activityType.yb)){
+ comActEasyPhotoVO1.setActivityMoney(photoActivityDO.getCommonlyReward());
+ }
}
}
}
@@ -119,11 +122,13 @@
if (ObjectUtils.isEmpty(comActEasyPhotoVO)||null== status) {
return R.fail("随手拍不存在");
}
- ComActEasyPhotoUserDO comActEasyPhotoUserDO = comActEasyPhotoUserDAO.selectOne(new QueryWrapper<ComActEasyPhotoUserDO>().lambda().eq(ComActEasyPhotoUserDO::getEasyPhotoId, id).eq(ComActEasyPhotoUserDO::getUserId, userId));
- if (ObjectUtils.isEmpty(comActEasyPhotoUserDO)) {
- comActEasyPhotoVO.setHaveGiveThumbsUp(0);
- } else {
- comActEasyPhotoVO.setHaveGiveThumbsUp(1);
+ if(!userId.equals(0L)){
+ ComActEasyPhotoUserDO comActEasyPhotoUserDO = comActEasyPhotoUserDAO.selectOne(new QueryWrapper<ComActEasyPhotoUserDO>().lambda().eq(ComActEasyPhotoUserDO::getEasyPhotoId, id).eq(ComActEasyPhotoUserDO::getUserId, userId));
+ if (ObjectUtils.isEmpty(comActEasyPhotoUserDO)) {
+ comActEasyPhotoVO.setHaveGiveThumbsUp(0);
+ } else {
+ comActEasyPhotoVO.setHaveGiveThumbsUp(1);
+ }
}
if (status.intValue()==4) {
@@ -225,7 +230,6 @@
// 操作类型 1审核通过 2驳回 3反馈
ComActEasyPhotoDO cmActEasyPhotoDO=new ComActEasyPhotoDO();
cmActEasyPhotoDO.setId(comActEasyPhotoVO.getId());
- cmActEasyPhotoDO.setHandlerId(comActEasyPhotoVO.getUserId());
// cmActEasyPhotoDO.setActivityType(comActEasyPhotoVO.getActivityType());
Date date = new Date();
switch (type){
@@ -241,6 +245,7 @@
}else{
cmActEasyPhotoDO.setStatus(4);//已完成
}
+ cmActEasyPhotoDO.setHandlerId(comActEasyPhotoVO.getUserId());
cmActEasyPhotoDO.setExamineAt(date);
cmActEasyPhotoDO.setActivityType(comActEasyPhotoVO.getActivityType());
break;
@@ -249,6 +254,7 @@
if(!cmActEasyPhotoDO.getStatus().equals(ComActEasyPhotoDO.status.dsh)){
return R.fail("该随手拍已审核，不可重复操作");
}
+ cmActEasyPhotoDO.setHandlerId(comActEasyPhotoVO.getUserId());
cmActEasyPhotoDO.setStatus(3);//已驳回
cmActEasyPhotoDO.setExamineAt(date);
cmActEasyPhotoDO.setRejectReason(comActEasyPhotoVO.getRejectReason());
@@ -258,6 +264,7 @@
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);//已完成
@@ -307,23 +314,25 @@
page.setCurrent(pageNum);
IPage<ComActEasyPhotoVO> iPage = comActEasyPhotoDAO.pageEasyPhotoApplets(page, comActEasyPhotoVO);
List<ComActEasyPhotoVO> records = iPage.getRecords();
- if (!ObjectUtils.isEmpty(records)) {
- records.forEach(comActEasyPhotoVO1 -> {
- Long id = comActEasyPhotoVO1.getId();
- Integer status = comActEasyPhotoVO1.getStatus();
- Date feedbackAt = comActEasyPhotoVO1.getFeedbackAt();
- List<ComActEasyPhotoUserDO> comActEasyPhotoUserDO =
- comActEasyPhotoUserDAO.selectList(new QueryWrapper<ComActEasyPhotoUserDO>().lambda().eq(ComActEasyPhotoUserDO::getEasyPhotoId, id).eq(ComActEasyPhotoUserDO::getUserId, userId));
- if (comActEasyPhotoUserDO==null||comActEasyPhotoUserDO.size()==0) {
- comActEasyPhotoVO1.setHaveGiveThumbsUp(0);
- }else {
- comActEasyPhotoVO1.setHaveGiveThumbsUp(1);
- }
- if(status.intValue()==4&&null==feedbackAt){
- comActEasyPhotoVO1.setFeedbackAt(comActEasyPhotoVO1.getExamineAt());
- }
- });
- iPage.setRecords(records);
+ if(userId != null){
+ if (!ObjectUtils.isEmpty(records)) {
+ records.forEach(comActEasyPhotoVO1 -> {
+ Long id = comActEasyPhotoVO1.getId();
+ Integer status = comActEasyPhotoVO1.getStatus();
+ Date feedbackAt = comActEasyPhotoVO1.getFeedbackAt();
+ List<ComActEasyPhotoUserDO> comActEasyPhotoUserDO =
+ comActEasyPhotoUserDAO.selectList(new QueryWrapper<ComActEasyPhotoUserDO>().lambda().eq(ComActEasyPhotoUserDO::getEasyPhotoId, id).eq(ComActEasyPhotoUserDO::getUserId, userId));
+ if (comActEasyPhotoUserDO==null||comActEasyPhotoUserDO.size()==0) {
+ comActEasyPhotoVO1.setHaveGiveThumbsUp(0);
+ }else {
+ comActEasyPhotoVO1.setHaveGiveThumbsUp(1);
+ }
+ if(status.intValue()==4&&null==feedbackAt){
+ comActEasyPhotoVO1.setFeedbackAt(comActEasyPhotoVO1.getExamineAt());
+ }
+ });
+ iPage.setRecords(records);
+ }
}
return R.ok(iPage);
}
@@ -457,6 +466,28 @@
}
//审核通过判断随手拍是否有活动并计算用户收益
comActUserWalletService.examineAddMoney(easyPhotoDO.getActivityType(),easyPhotoDO.getId(),easyPhotoDO.getSponsorId(),grantRewardDTO.getAmount());
+
+ String activityType = "";
+ if(easyPhotoDO.getActivityType().equals(ComActEasyPhotoDO.activityType.yz)){
+ activityType = "优质";
+ }else if(easyPhotoDO.getActivityType().equals(ComActEasyPhotoDO.activityType.jl)){
+ activityType = "精良";
+ }else if(easyPhotoDO.getActivityType().equals(ComActEasyPhotoDO.activityType.pt)){
+ activityType = "普通";
+ }else if(easyPhotoDO.getActivityType().equals(ComActEasyPhotoDO.activityType.yb)){
+ activityType = "一般";
+ }
+ //发放奖励以后给用户推送消息
+ Map<String,String> map = comActActSignDAO.getUserOpenId(easyPhotoDO.getSponsorId());
+ if(map != null){
+ String openid = map.get("openid");
+ WxXCXTempSend util = new WxXCXTempSend();
+ try {
+ WxUtil.sendSubscribeJLDZ(openid,util.getAppAccessToken(),"随手拍有奖活动",grantRewardDTO.getAmount(),activityType);
+ }catch (Exception e){
+ log.error("消息推送失败，失败原因：" + e.getMessage());
+ }
+ }
}
}
return R.ok();
--
Gitblit v1.7.1