lidongdong
2024-03-06 6d227ee4fa9167443cfa6226323d26ad2b8edcef
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");
@@ -1521,10 +1521,9 @@
            if (comActActActRegistDO.getEndTime() != null) {
                return R.fail("无法重复签退");
            }
            int retrieveIntegral = 0;
            comActActRegistDO.setId(comActActActRegistDO.getId());
            comActActRegistDO.setEndTime(nowDate);
            comActActRegistDO.setAward(retrieveIntegral);
            comActActRegistDO.setAward(rewardIntegral);
            int result = comActActRegistDAO.updateById(comActActRegistDO);
            if (result > 0) {
                if (isHave) {
@@ -1539,19 +1538,27 @@
//                    comActIntegralUserTradeService.addIntegralTradeAdmin(addComActIntegralUserDTO);
                    //查询个人金汇币总额
                    R<JinhuiCoinGeneralTable> jinhuiCoinGeneralTable=jinhuiCommunityService.coinTableGetDetails(userId+"");
                    JinhuiCoinGeneralTable jinhuiCoinGeneralTable=comActActRegistDAO.getDetails(userId+"");
                    if(jinhuiCoinGeneralTable!=null)
                    {
                        if (!StringUtils.isEmpty(jinhuiCoinGeneralTable.getData().getGoldCoin()))
                        JinhuiCoinGeneralTableVO jinhuiVO=new JinhuiCoinGeneralTableVO();
                        jinhuiVO.setId(jinhuiCoinGeneralTable.getId());
                        int allGold=0;
                        if (!StringUtils.isEmpty(jinhuiCoinGeneralTable.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);
                            allGold=Integer.valueOf(jinhuiCoinGeneralTable.getGoldCoin());
                        }
                        allGold=allGold+rewardIntegral;
                        jinhuiVO.setGoldCoin(allGold+"");
                        jinhuiCommunityService.coinTableEditData(jinhuiVO);
                    }
                    else
                    {
                        JinhuiCoinGeneralTableVO jinhuiVO=new JinhuiCoinGeneralTableVO();
                        jinhuiVO.setCommunityId(comActActivityDO.getCommunityId()+"");
                        jinhuiVO.setGoldCoin(rewardIntegral+"");
                        jinhuiVO.setUserId(userId+"");
                        jinhuiCommunityService.coinTableAddData(jinhuiVO);
                    }
                    JinhuiGoldCoinRecordVO jVo=new JinhuiGoldCoinRecordVO();