From 83bc3fa08e243b5b7227fa446951543a3a85a0ca Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期二, 14 十二月 2021 15:39:55 +0800
Subject: [PATCH] 修改bug
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralUserTradeServiceImpl.java | 45 ++++++++++++++++++++++++++++++++-------------
1 files changed, 32 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 fa5be90..8b46e66 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
@@ -312,11 +312,26 @@
identityType=1;
}
}
- }else {
- ComPbActivityDO comPbActivityDO = comBpActivityDAO.selectById(serviceId);
- if(comPbActivityDO!=null){
- amount=comPbActivityDO.getRewardIntegral();
- identityType=2;
+ }
+// else {
+// ComPbActivityDO comPbActivityDO = comBpActivityDAO.selectById(serviceId);
+// if(comPbActivityDO!=null){
+// amount=comPbActivityDO.getRewardIntegral();
+// identityType=2;
+// }
+// }
+ break;
+ case 9:
+ remark.append("取消活动扣除积分");
+ if (integralUserDTO.getActivityType() == 1) {
+ ComActActivityDO actActivityDO1 = comActActivityService.getById(serviceId);
+ if (actActivityDO1 != null) {
+ amount = -actActivityDO1.getCancelDeduct();
+ if (actActivityDO1.getVolunteerMax() != 0) {
+ identityType = 3;
+ } else {
+ identityType = 1;
+ }
}
}
default:
@@ -366,19 +381,19 @@
Integer integralAvailableResident = integralUserDO.getIntegralAvailableResident();
Integer integralFrozenResident = integralUserDO.getIntegralFrozenResident();
- integralUserDO.setIntegralSum(integralUserDO.getIntegralSum() + amount);
- integralUserDO.setIntegralAvailableSum(integralUserDO.getIntegralAvailableSum() + amount);
+ integralUserDO.setIntegralSum(addIntegral(integralUserDO.getIntegralSum() + amount));
+ integralUserDO.setIntegralAvailableSum(addIntegral(integralUserDO.getIntegralAvailableSum() + amount));
integralUserDO.setUpdateAt(nowDate);
// 根据不同身份，计算钱包金额
if (identityType.equals(ComActIntegralUserTradeDO.identityType.jm)) {
- integralUserDO.setIntegralResident(integralUserDO.getIntegralResident() + amount);
- integralUserDO.setIntegralAvailableResident(integralUserDO.getIntegralAvailableResident() + amount);
+ integralUserDO.setIntegralResident(addIntegral(integralUserDO.getIntegralResident() + amount));
+ integralUserDO.setIntegralAvailableResident(addIntegral(integralUserDO.getIntegralAvailableResident() + amount));
} else if (identityType.equals(ComActIntegralUserTradeDO.identityType.dy)) {
- integralUserDO.setIntegralParty(integralUserDO.getIntegralParty() + amount);
- integralUserDO.setIntegralAvailableParty(integralUserDO.getIntegralAvailableParty() + amount);
+ integralUserDO.setIntegralParty(addIntegral(integralUserDO.getIntegralParty() + amount));
+ integralUserDO.setIntegralAvailableParty(addIntegral(integralUserDO.getIntegralAvailableParty() + amount));
} else if (identityType.equals(ComActIntegralUserTradeDO.identityType.zyz)) {
- integralUserDO.setIntegralVolunteer(integralUserDO.getIntegralVolunteer() + amount);
- integralUserDO.setIntegralAvailableVolunteer(integralUserDO.getIntegralAvailableVolunteer() + amount);
+ integralUserDO.setIntegralVolunteer(addIntegral(integralUserDO.getIntegralVolunteer() + amount));
+ integralUserDO.setIntegralAvailableVolunteer(addIntegral(integralUserDO.getIntegralAvailableVolunteer() + amount));
}
// 更新钱包
comActIntegralUserService.updateById(integralUserDO);
@@ -398,6 +413,10 @@
return R.ok();
}
+ private int addIntegral(int integral) {
+ return integral > 0 ? integral : 0;
+ }
+
/**
* 根据类型、用户id、社区id构建查询请求参数
*
--
Gitblit v1.7.1