From 3389e27613953cf3d7d06653139bf902e08736dc Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 22 十月 2021 13:58:33 +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/ComActIntegralUserTradeServiceImpl.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralUserTradeServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralUserTradeServiceImpl.java
index afb6738..7f588c4 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralUserTradeServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralUserTradeServiceImpl.java
@@ -4,6 +4,7 @@
import javax.annotation.Resource;
+import com.panzhihua.service_community.dao.ComBpActivityDAO;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -56,6 +57,8 @@
private ComActDiscussOptionService comActDiscussOptionService;
@Resource
private ComActActivityService comActActivityService;
+ @Resource
+ private ComBpActivityDAO comBpActivityDAO;
/**
* 查询用户某个时间段交易数量
@@ -170,7 +173,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
public R addIntegralTradeAdmin(AddComActIntegralUserDTO integralUserDTO) {
- // 判断增加积分类型 积分任务类型（1.发布随手拍 2.发布微心愿 3.参与议事投票 4.参与志愿者活动 5.参与社区活动 6.参与党员活动 7.参与调查问卷）
+ // 判断增加积分类型 积分任务类型（1.发布随手拍 2.发布微心愿 3.参与议事投票 4.参与志愿者活动 5.参与社区活动 6.参与党员活动 7.参与调查问卷 8.活动签到 9.取消活动）
Integer type = integralUserDTO.getIntegralType();
// 业务id
Long serviceId = integralUserDTO.getServiceId();
@@ -297,6 +300,26 @@
remark.append(questnaireDO.getTitle());
remark.append("】");
break;
+ case 8:
+ remark.append("成功参加活动奖励积分");
+ if(integralUserDTO.getActivityType()==1){
+ ComActActivityDO actActivityDO1 = comActActivityService.getById(serviceId);
+ if(actActivityDO1!=null){
+ amount=actActivityDO1.getRewardIntegral();
+ if(actActivityDO1.getVolunteerMax()!=0){
+ identityType=3;
+ }else {
+ identityType=1;
+ }
+ }
+ }
+// else {
+// ComPbActivityDO comPbActivityDO = comBpActivityDAO.selectById(serviceId);
+// if(comPbActivityDO!=null){
+// amount=comPbActivityDO.getRewardIntegral();
+// identityType=2;
+// }
+// }
default:
break;
}
--
Gitblit v1.7.1