From 7feaca70af67690ae9c90cbd14694ea582caaa90 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 10 三月 2022 13:39:46 +0800
Subject: [PATCH] Merge branch 'hemenkou_dev' into dev
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralUserTradeServiceImpl.java | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 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 bc0a254..40a87a2 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
@@ -283,7 +283,11 @@
break;
case 6:
identityType = 2;
- remark.append("参与党员活动");
+ remark.append("成功参加党员活动奖励积分");
+ ComActActivityDO actActivityDO3 = comActActivityService.getById(serviceId);
+ if(actActivityDO3 != null) {
+ amount = actActivityDO3.getRewardIntegral();
+ }
break;
case 7:
// 查询调查问卷
@@ -319,16 +323,17 @@
ComActActivityDO actActivityDO2 = comActActivityService.getById(serviceId);
if (actActivityDO2 != null) {
amount = -actActivityDO2.getCancelDeduct();
- if (actActivityDO2.getVolunteerMax() != 0) {
+ if (isVolunteer.equals(1)) {
+ identityType=3;
remark.append("取消志愿者活动扣除积分");
- } else {
- remark.append("取消居民活动扣除积分");
+ } else if(actActivityDO2.getType()==3){
+ identityType=2;
+ remark.append("取消党员活动扣除积分");
}
- }
- if (nonNull(isVolunteer) && isVolunteer.equals(1)) {
- identityType = 3;
- } else {
- identityType = 1;
+ else {
+ identityType=1;
+ remark.append("取消党员活动扣除积分");
+ }
}
}
// else {
--
Gitblit v1.7.1