From 2d0487d82ff61219c71155699b52d8d339a2443a Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 23 三月 2022 14:35:27 +0800
Subject: [PATCH] Merge branch 'dev'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 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 bd3e305..9f267de 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,7 +7,6 @@
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;
@@ -118,7 +117,7 @@
}
if (comActEasyPhotoVO1.getActivityId() != null
- && comActEasyPhotoVO1.getStatus().equals(ComActEasyPhotoDO.status.ywc)) {
+ && comActEasyPhotoVO1.getStatus().equals(ComActEasyPhotoDO.status.dpj)) {
// 查询随手拍活动
ComActEasyPhotoActivityDO photoActivityDO =
comActEasyPhotoActivityMapper.selectById(comActEasyPhotoVO1.getActivityId());
@@ -330,7 +329,7 @@
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);
+ ,cmActEasyPhotoDO.getId(),handle.getType(), ComActEasyPhotoHandler.ServiceType.SSP,comActEasyPhotoVO.getSponsorId());
});
}
break;
@@ -357,7 +356,7 @@
comActEasyPhotoFeedbackMapper.insert(photoFeedbackDO);
break;
case 4:
- if (cmActEasyPhotoDO.getStatus().equals(ComActEasyPhotoDO.status.ywc)) {
+ if (cmActEasyPhotoDO.getStatus().equals(ComActEasyPhotoDO.status.ypj)) {
return R.fail("该随手拍已完成，不可重复操作");
}
if (StringUtils.isNotEmpty(comActEasyPhotoVO.getHandleResult())
@@ -379,7 +378,7 @@
// comActUserWalletService.examineAddMoney(comActEasyPhotoVO.getActivityType(),comActEasyPhotoVO.getId(),comActEasyPhotoVO.getUserId(),BigDecimal.ZERO);
// }
cmActEasyPhotoDO.setFeedbackAt(nowDate);
- cmActEasyPhotoDO.setStatus(ComActEasyPhotoDO.status.ywc);
+ cmActEasyPhotoDO.setStatus(ComActEasyPhotoDO.status.dpj);
cmActEasyPhotoDO.setCompleteId(comActEasyPhotoVO.getUserId());
if(comActEasyPhotoVO.getUrbanStatus()!=null&&comActEasyPhotoVO.getUrbanStatus()==2){
cmActEasyPhotoDO.setUrbanStatus(2);
--
Gitblit v1.7.1