From 63bf086547761ffacfb6ad6df0d8d9030cf0b1c6 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期五, 05 八月 2022 13:55:14 +0800
Subject: [PATCH] bug修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
index 84d7ea9..7af1d14 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
@@ -1067,22 +1067,23 @@
return R.fail("无法重复签退");
}
int hours = com.panzhihua.common.utlis.DateUtils.getHour(comActActActRegistDO.getStartTime(), nowDate);
+ int retrieveIntegral = rewardWay == 1 ? rewardIntegral : rewardIntegral * hours;
comActActRegistDO.setId(comActActActRegistDO.getId());
comActActRegistDO.setEndTime(nowDate);
- comActActRegistDO.setAward(rewardIntegral * hours);
+ comActActRegistDO.setAward(retrieveIntegral);
int result = comActActRegistDAO.updateById(comActActRegistDO);
if (result > 0) {
if (isHave) {
AddComActIntegralUserDTO addComActIntegralUserDTO = new AddComActIntegralUserDTO();
addComActIntegralUserDTO.setUserId(userId);
addComActIntegralUserDTO.setIntegralType(integralType);
- addComActIntegralUserDTO.setIntegral(rewardIntegral * hours);
+ addComActIntegralUserDTO.setIntegral(retrieveIntegral);
addComActIntegralUserDTO.setSignIdentity(comActActSignDO.getSignIdentity());
addComActIntegralUserDTO.setCommunityId(comActActivityDO.getCommunityId());
addComActIntegralUserDTO.setServiceId(activityId);
addComActIntegralUserDTO.setRemark(remark);
comActIntegralUserTradeService.addIntegralTradeAdmin(addComActIntegralUserDTO);
- return R.ok(rewardIntegral * hours);
+ return R.ok(retrieveIntegral);
} else {
return R.ok();
}
--
Gitblit v1.7.1