From 6d227ee4fa9167443cfa6226323d26ad2b8edcef Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 06 三月 2024 16:25:20 +0800
Subject: [PATCH] 修改金汇币活动获取数据显示
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 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 a26b627..af625b8 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
@@ -1440,16 +1440,16 @@
if(!StringUtils.isEmpty(actActivityDO.getJinhuiCoinPunishment()) && !StringUtils.equals(actActivityDO.getJinhuiCoinPunishment(),"0"))
{
//查询个人金汇币总额
- R<JinhuiCoinGeneralTable> jinhuiCoinGeneralTable=jinhuiCommunityService.coinTableGetDetails(userId+"");
+ JinhuiCoinGeneralTable jinhuiCoinGeneralTable=comActActRegistDAO.getDetails(userId+"");
if(jinhuiCoinGeneralTable!=null)
{
- if (!StringUtils.isEmpty(jinhuiCoinGeneralTable.getData().getGoldCoin()))
+ if (!StringUtils.isEmpty(jinhuiCoinGeneralTable.getGoldCoin()))
{
JinhuiCoinGeneralTableVO jinhuiVO=new JinhuiCoinGeneralTableVO();
- jinhuiVO.setId(jinhuiCoinGeneralTable.getData().getId());
+ jinhuiVO.setId(jinhuiCoinGeneralTable.getId());
int punishmentGold=Integer.valueOf(actActivityDO.getJinhuiCoinPunishment());
- int allGold=Integer.valueOf(jinhuiCoinGeneralTable.getData().getGoldCoin());
+ int allGold=Integer.valueOf(jinhuiCoinGeneralTable.getGoldCoin());
if(punishmentGold>=allGold)
{
jinhuiVO.setGoldCoin("0");
@@ -1523,7 +1523,7 @@
}
comActActRegistDO.setId(comActActActRegistDO.getId());
comActActRegistDO.setEndTime(nowDate);
- comActActRegistDO.setAward(0);
+ comActActRegistDO.setAward(rewardIntegral);
int result = comActActRegistDAO.updateById(comActActRegistDO);
if (result > 0) {
if (isHave) {
@@ -1538,16 +1538,15 @@
// comActIntegralUserTradeService.addIntegralTradeAdmin(addComActIntegralUserDTO);
//查询个人金汇币总额
- R<JinhuiCoinGeneralTable> jinhuiCoinGeneralTable=jinhuiCommunityService.coinTableGetDetails(userId+"");
- JinhuiCoinGeneralTable table=jinhuiCoinGeneralTable.getData();
- if(table!=null)
+ JinhuiCoinGeneralTable jinhuiCoinGeneralTable=comActActRegistDAO.getDetails(userId+"");
+ if(jinhuiCoinGeneralTable!=null)
{
JinhuiCoinGeneralTableVO jinhuiVO=new JinhuiCoinGeneralTableVO();
- jinhuiVO.setId(table.getId());
+ jinhuiVO.setId(jinhuiCoinGeneralTable.getId());
int allGold=0;
- if (!StringUtils.isEmpty(table.getGoldCoin()))
+ if (!StringUtils.isEmpty(jinhuiCoinGeneralTable.getGoldCoin()))
{
- allGold=Integer.valueOf(table.getGoldCoin());
+ allGold=Integer.valueOf(jinhuiCoinGeneralTable.getGoldCoin());
}
allGold=allGold+rewardIntegral;
jinhuiVO.setGoldCoin(allGold+"");
--
Gitblit v1.7.1