From 00a59b93c16b24e7be77c6f1ce4866c75a2e0431 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期二, 19 四月 2022 16:32:21 +0800
Subject: [PATCH] 花城E+防疫修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralUserTradeServiceImpl.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 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 5eab07b..637e82b 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:
// 查询调查问卷
@@ -315,21 +319,21 @@
break;
case 8:
changeType = ComActIntegralUserTradeDO.changeType.reduce;
- if (integralUserDTO.getActivityType() == 1) {
ComActActivityDO actActivityDO2 = comActActivityService.getById(serviceId);
if (actActivityDO2 != null) {
amount = -actActivityDO2.getCancelDeduct();
- if (actActivityDO2.getVolunteerMax() != 0) {
+ if (actActivityDO2.getType()==1) {
+ identityType=3;
remark.append("取消志愿者活动扣除积分");
- } else {
+ } else if(actActivityDO2.getType()==3){
+ identityType=2;
+ remark.append("取消党员活动扣除积分");
+ }
+ else {
+ identityType=1;
remark.append("取消居民活动扣除积分");
}
- }
- if (nonNull(isVolunteer) && isVolunteer.equals(1)) {
- identityType = 3;
- } else {
- identityType = 1;
- }
+
}
// else {
// ComPbActivityDO comPbActivityDO = comBpActivityDAO.selectById(serviceId);
--
Gitblit v1.7.1