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 | 40 ++++++++++++++++++++++------------------
1 files changed, 22 insertions(+), 18 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 e35bdb4..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
@@ -101,10 +101,6 @@
@Override
public Long addIntegralTradeRecord(Long userId, Long integralId, Long communityId, Long serviceId,
Integer serviceType, Integer amount, Integer changeType, String remark, Integer identityType, Long createBy) {
- if (amount < 0) {
- changeType = ComActIntegralUserTradeDO.changeType.reduce;
- amount = Math.abs(amount);
- }
ComActIntegralUserTradeDO integralUserTradeDO = new ComActIntegralUserTradeDO();
integralUserTradeDO.setId(Snowflake.getId());
integralUserTradeDO.setUserId(userId);
@@ -196,6 +192,8 @@
// 当前时间
Date nowDate = new Date();
+ Integer changeType = ComActIntegralUserTradeDO.changeType.add;
+
Integer isVolunteer = integralUserDTO.getIsVolunteer();
if (!type.equals(8)) {
@@ -285,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:
// 查询调查问卷
@@ -316,21 +318,22 @@
remark.append("】");
break;
case 8:
- if (integralUserDTO.getActivityType() == 1) {
+ changeType = ComActIntegralUserTradeDO.changeType.reduce;
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);
@@ -411,9 +414,10 @@
integralUserDO.setIntegralVolunteer(integralVolunteerNow);
integralUserDO.setIntegralAvailableVolunteer(addIntegral(integralUserDO.getIntegralAvailableVolunteer() + amount));
}
- if (reduceAmount > 0) {
- integralUserDO.setIntegralSum(addIntegral(integralSum + reduceAmount));
- integralUserDO.setIntegralAvailableSum(addIntegral(integralAvailableSum + reduceAmount));
+ if (changeType == ComActIntegralUserTradeDO.changeType.reduce) {
+ amount = reduceAmount;
+ integralUserDO.setIntegralSum(addIntegral(integralSum - reduceAmount));
+ integralUserDO.setIntegralAvailableSum(addIntegral(integralAvailableSum - reduceAmount));
} else {
integralUserDO.setIntegralSum(addIntegral(integralSum + amount));
integralUserDO.setIntegralAvailableSum(addIntegral(integralAvailableSum + amount));
@@ -424,7 +428,7 @@
comActIntegralUserService.updateById(integralUserDO);
// 增加积分账户交易记录
Long tradeId = this.addIntegralTradeRecord(userId, integralId, communityId, serviceId, type, amount,
- ComActIntegralUserTradeDO.changeType.add, remark.toString(), identityType, 2L);
+ changeType, remark.toString(), identityType, 2L);
// 增加积分账户变更记录
comActIntegralUserChangeService.addIntegralUserChangeRecord(userId, integralId, communityId, integralSum,
integralUserDO.getIntegralSum(), integralAvailableSum, integralUserDO.getIntegralAvailableSum(),
--
Gitblit v1.7.1