From b92edf56e7e25440e7c46b967aa5373a7a8b25c2 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期一, 14 三月 2022 09:22:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralUserTradeServiceImpl.java | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 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 d5dcca2..9cc05c7 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 {
- 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 {
// ComPbActivityDO comPbActivityDO = comBpActivityDAO.selectById(serviceId);
@@ -412,8 +416,8 @@
}
if (changeType == ComActIntegralUserTradeDO.changeType.reduce) {
amount = reduceAmount;
- integralUserDO.setIntegralSum(addIntegral(integralSum + reduceAmount));
- integralUserDO.setIntegralAvailableSum(addIntegral(integralAvailableSum + reduceAmount));
+ integralUserDO.setIntegralSum(addIntegral(integralSum - reduceAmount));
+ integralUserDO.setIntegralAvailableSum(addIntegral(integralAvailableSum - reduceAmount));
} else {
integralUserDO.setIntegralSum(addIntegral(integralSum + amount));
integralUserDO.setIntegralAvailableSum(addIntegral(integralAvailableSum + amount));
--
Gitblit v1.7.1