From 44a208a112298cfc08c5c265cb2a3296f01c70bc Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期五, 13 十月 2023 14:41:53 +0800
Subject: [PATCH] 社区活动修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java | 112 +++++++++++++++++++++++++++++--------------------------
1 files changed, 59 insertions(+), 53 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 a845ddf..f1bb1c7 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
@@ -24,11 +24,15 @@
import com.panzhihua.common.constants.HttpStatus;
import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.dtos.community.ActivityInviteDTO;
+import com.panzhihua.common.model.vos.jinhui.JinhuiCoinGeneralTableVO;
+import com.panzhihua.common.model.vos.jinhui.JinhuiGoldCoinRecordVO;
+import com.panzhihua.common.service.jinhui.JinhuiCommunityService;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.dao.ComActNeighborCircleDAO;
import com.panzhihua.service_community.dao.ComActNeighborCircleTopicWestMapper;
import com.panzhihua.service_community.dao.ComPbMemberDAO;
import com.panzhihua.service_community.entity.ComActActivityInvite;
+import com.panzhihua.service_community.entity.JinhuiCoinGeneralTable;
import com.panzhihua.service_community.model.dos.ComActNeighborCircleTopicWestDO;
import com.panzhihua.service_community.service.ComActActivityInviteService;
import com.panzhihua.service_community.util.WxMaConfiguration;
@@ -146,6 +150,8 @@
private ComActNeighborCircleDAO comActNeighborCircleDAO;
@Resource
private WxMaConfiguration wxMaConfiguration;
+ @Resource
+ private JinhuiCommunityService jinhuiCommunityService;
/**
* 新增社区活动
@@ -1434,37 +1440,37 @@
if(!StringUtils.isEmpty(actActivityDO.getJinhuiCoinPunishment()) && !StringUtils.equals(actActivityDO.getJinhuiCoinPunishment(),"0"))
{
//查询个人金汇币总额
-// R<JinhuiCoinGeneralTable> jinhuiCoinGeneralTable=jinhuiCommunityService.coinTableGetDetails(userId+"");
-// if(jinhuiCoinGeneralTable!=null)
-// {
-// if (!StringUtils.isEmpty(jinhuiCoinGeneralTable.getData().getGoldCoin()))
-// {
-// JinhuiCoinGeneralTableVO jinhuiVO=new JinhuiCoinGeneralTableVO();
-// jinhuiVO.setId(jinhuiCoinGeneralTable.getData().getId());
-//
-// int punishmentGold=Integer.valueOf(actActivityDO.getJinhuiCoinPunishment());
-// int allGold=Integer.valueOf(jinhuiCoinGeneralTable.getData().getGoldCoin());
-// if(punishmentGold>=allGold)
-// {
-// jinhuiVO.setGoldCoin("0");
-// }
-// else
-// {
-// allGold=allGold-punishmentGold;
-// jinhuiVO.setGoldCoin(allGold+"");
-// }
-// jinhuiCommunityService.coinTableEditData(jinhuiVO);
-// }
-// }
+ R<JinhuiCoinGeneralTable> jinhuiCoinGeneralTable=jinhuiCommunityService.coinTableGetDetails(userId+"");
+ if(jinhuiCoinGeneralTable!=null)
+ {
+ if (!StringUtils.isEmpty(jinhuiCoinGeneralTable.getData().getGoldCoin()))
+ {
+ JinhuiCoinGeneralTableVO jinhuiVO=new JinhuiCoinGeneralTableVO();
+ jinhuiVO.setId(jinhuiCoinGeneralTable.getData().getId());
-// JinhuiGoldCoinRecordVO jVo=new JinhuiGoldCoinRecordVO();
-// jVo.setCommunityId(actActivityDO.getCommunityId()+"");
-// jVo.setTitle("取消志愿者活动");
-// jVo.setUserId(userId+"");
-// jVo.setRemark("取消志愿者活动");
-// jVo.setType("2");
-// jVo.setGoldCoin(actActivityDO.getJinhuiCoinPunishment());
-// jinhuiCommunityService.recordAddData(jVo);
+ int punishmentGold=Integer.valueOf(actActivityDO.getJinhuiCoinPunishment());
+ int allGold=Integer.valueOf(jinhuiCoinGeneralTable.getData().getGoldCoin());
+ if(punishmentGold>=allGold)
+ {
+ jinhuiVO.setGoldCoin("0");
+ }
+ else
+ {
+ allGold=allGold-punishmentGold;
+ jinhuiVO.setGoldCoin(allGold+"");
+ }
+ jinhuiCommunityService.coinTableEditData(jinhuiVO);
+ }
+ }
+
+ JinhuiGoldCoinRecordVO jVo=new JinhuiGoldCoinRecordVO();
+ jVo.setCommunityId(actActivityDO.getCommunityId()+"");
+ jVo.setTitle("取消志愿者活动");
+ jVo.setUserId(userId+"");
+ jVo.setRemark("取消志愿者活动");
+ jVo.setType("2");
+ jVo.setGoldCoin(actActivityDO.getJinhuiCoinPunishment());
+ jinhuiCommunityService.recordAddData(jVo);
}
@@ -1533,29 +1539,29 @@
// comActIntegralUserTradeService.addIntegralTradeAdmin(addComActIntegralUserDTO);
//查询个人金汇币总额
-// R<JinhuiCoinGeneralTable> jinhuiCoinGeneralTable=jinhuiCommunityService.coinTableGetDetails(userId+"");
-// if(jinhuiCoinGeneralTable!=null)
-// {
-// if (!StringUtils.isEmpty(jinhuiCoinGeneralTable.getData().getGoldCoin()))
-// {
-// JinhuiCoinGeneralTableVO jinhuiVO=new JinhuiCoinGeneralTableVO();
-// jinhuiVO.setId(jinhuiCoinGeneralTable.getData().getId());
-//
-// int allGold=Integer.valueOf(jinhuiCoinGeneralTable.getData().getGoldCoin());
-// allGold=allGold+rewardIntegral;
-// jinhuiVO.setGoldCoin(allGold+"");
-// jinhuiCommunityService.coinTableEditData(jinhuiVO);
-// }
-// }
-//
-// JinhuiGoldCoinRecordVO jVo=new JinhuiGoldCoinRecordVO();
-// jVo.setCommunityId(comActActivityDO.getCommunityId()+"");
-// jVo.setTitle("志愿者活动奖励");
-// jVo.setUserId(userId+"");
-// jVo.setRemark("志愿者活动奖励");
-// jVo.setType("1");
-// jVo.setGoldCoin(rewardIntegral+"");
-// jinhuiCommunityService.recordAddData(jVo);
+ R<JinhuiCoinGeneralTable> jinhuiCoinGeneralTable=jinhuiCommunityService.coinTableGetDetails(userId+"");
+ if(jinhuiCoinGeneralTable!=null)
+ {
+ if (!StringUtils.isEmpty(jinhuiCoinGeneralTable.getData().getGoldCoin()))
+ {
+ JinhuiCoinGeneralTableVO jinhuiVO=new JinhuiCoinGeneralTableVO();
+ jinhuiVO.setId(jinhuiCoinGeneralTable.getData().getId());
+
+ int allGold=Integer.valueOf(jinhuiCoinGeneralTable.getData().getGoldCoin());
+ allGold=allGold+rewardIntegral;
+ jinhuiVO.setGoldCoin(allGold+"");
+ jinhuiCommunityService.coinTableEditData(jinhuiVO);
+ }
+ }
+
+ JinhuiGoldCoinRecordVO jVo=new JinhuiGoldCoinRecordVO();
+ jVo.setCommunityId(comActActivityDO.getCommunityId()+"");
+ jVo.setTitle("志愿者活动奖励");
+ jVo.setUserId(userId+"");
+ jVo.setRemark("志愿者活动奖励");
+ jVo.setType("1");
+ jVo.setGoldCoin(rewardIntegral+"");
+ jinhuiCommunityService.recordAddData(jVo);
return R.ok();
} else {
return R.ok();
--
Gitblit v1.7.1