From b048146fe01497f47f35f24c10b9bf1e3a06bdf6 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 18 十月 2021 15:18:57 +0800
Subject: [PATCH] 活动改版
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralUserTradeServiceImpl.java | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 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 719b0f2..fa5be90 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;
/**
* 查询用户某个时间段交易数量
@@ -299,9 +302,22 @@
break;
case 8:
remark.append("成功参加活动奖励积分");
- ComActActivityDO actActivityDO1 = comActActivityService.getById(serviceId);
- if(actActivityDO1!=null){
- amount=actActivityDO1.getRewardIntegral();
+ 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