From d89d4a28653657528dc0718f1aa55e1c84ad1e6f Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 19 四月 2022 10:36:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/lyq_battery_shop' into lyq_battery_shop
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralUserTradeServiceImpl.java | 10 +++-------
1 files changed, 3 insertions(+), 7 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 40a87a2..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
@@ -319,11 +319,10 @@
break;
case 8:
changeType = ComActIntegralUserTradeDO.changeType.reduce;
- if (integralUserDTO.getActivityType() == 1) {
ComActActivityDO actActivityDO2 = comActActivityService.getById(serviceId);
if (actActivityDO2 != null) {
amount = -actActivityDO2.getCancelDeduct();
- if (isVolunteer.equals(1)) {
+ if (actActivityDO2.getType()==1) {
identityType=3;
remark.append("取消志愿者活动扣除积分");
} else if(actActivityDO2.getType()==3){
@@ -332,9 +331,9 @@
}
else {
identityType=1;
- remark.append("取消党员活动扣除积分");
+ remark.append("取消居民活动扣除积分");
}
- }
+
}
// else {
// ComPbActivityDO comPbActivityDO = comBpActivityDAO.selectById(serviceId);
@@ -404,9 +403,6 @@
int integralPartyNow = addIntegral(integralParty + amount);
if (amount < 0) {
reduceAmount = integralParty - integralPartyNow;
- }
- if(amount>0){
- integralUserDO.setIntegralPartyTime(integralUserDO.getIntegralPartyTime()+integralUserDTO.getIntegralPartyTime());
}
integralUserDO.setIntegralParty(integralPartyNow);
integralUserDO.setIntegralAvailableParty(addIntegral(integralUserDO.getIntegralAvailableParty() + amount));
--
Gitblit v1.7.1