Merge branch 'bea' of http://120.27.238.55:7000/r/exchange into bea

KKSU

2024-09-30 36be00e0f3cbe0d559c646fd2977e6e3a74aa6f9

 src/main/java/com/xcong/excoin/modules/coin/service/impl/ZhiyaServiceImpl.java

@@ -306,6 +306,12 @@
            zhiya.setFrozenBalance(gusdfrozenBalance.subtract(balance));
            zhiya.setAvailableBalance(gusdAvailableBalance.add(balance));
            zhiYaDao.updateById(zhiya);
            //赎回后奖励直接去币币账户
            Long sumReward = zhiYaDao.selectSumRewardByMemberIdAndRecordIdAndType(memberId,id,1);
            MemberWalletCoinEntity memberWalletCoinEntity = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, CoinTypeEnum.GRICE.toString());
            memberWalletCoinEntity.setAvailableBalance(memberWalletCoinEntity.getAvailableBalance().add(new BigDecimal(sumReward)));
            memberWalletCoinEntity.setTotalBalance(memberWalletCoinEntity.getTotalBalance().add(new BigDecimal(sumReward)));
            memberWalletCoinDao.updateById(memberWalletCoinEntity);
            //更新团队算力表
            MemberEntity memberEntity = memberdao.selectById(memberId);
            String refererIds = memberEntity.getRefererIds();
@@ -415,13 +421,13 @@
                            zhiyaRewardEntity.setType(1);
                            MemberEntity member = memberdao.selectById(zhiYaRecordEntity.getMemberId());
                            //获取当前人的上两级
                            BigDecimal multiplyReward = BigDecimal.ZERO;
                            BigDecimal multiplyReward = zhiYaRecordEntity.getZhiyaCnt().multiply(gusdReward);
                            MemberEntity memberEntity = memberdao.selectMemberInfoByInviteId(member.getRefererId());
                            if(ObjectUtil.isNotEmpty(memberEntity)){
                                //以及1代理的比例
                                BigDecimal agetShangji = new BigDecimal(redisUtils.getString("GUSDREWARDAGENTONE"));
                                BigDecimal multiply = zhiYaRecordEntity.getZhiyaCnt().multiply(gusdReward).multiply(agetShangji);
                                multiplyReward = (zhiYaRecordEntity.getZhiyaCnt().multiply(gusdReward).subtract(multiply));
                                multiplyReward = multiplyReward.subtract(multiply);
                                ZhiyaRewardEntity zhiyaRewardEntitySJ = new ZhiyaRewardEntity();
                                zhiyaRewardEntitySJ.setRecordId(zhiYaRecordEntity.getId());
                                zhiyaRewardEntitySJ.setRecordNo(zhiYaRecordEntity.getOrderNo());
@@ -439,11 +445,11 @@
                                if(ObjectUtil.isNotEmpty(memberEntitySSJ)){
                                    BigDecimal agetSSJ = new BigDecimal(redisUtils.getString("GUSDREWARDAGENTTWO"));
                                    BigDecimal multiplySSJ = zhiYaRecordEntity.getZhiyaCnt().multiply(gusdReward).multiply(agetSSJ);
                                    multiplyReward = (zhiYaRecordEntity.getZhiyaCnt().multiply(gusdReward).subtract(multiply).subtract(multiplySSJ));
                                    multiplyReward = multiplyReward.subtract(multiplySSJ);

                                    MemberWalletCoinEntity memberWalletCoinEntitySSJ = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberEntitySSJ.getId(), CoinTypeEnum.GRICE.toString());
                                    memberWalletCoinEntitySSJ.setAvailableBalance(memberWalletCoinEntitySSJ.getAvailableBalance().add(multiply));
                                    memberWalletCoinEntitySSJ.setTotalBalance(memberWalletCoinEntitySSJ.getTotalBalance().add(multiply));
                                    memberWalletCoinEntitySSJ.setAvailableBalance(memberWalletCoinEntitySSJ.getAvailableBalance().add(multiplySSJ));
                                    memberWalletCoinEntitySSJ.setTotalBalance(memberWalletCoinEntitySSJ.getTotalBalance().add(multiplySSJ));
                                    memberWalletCoinDao.updateById(memberWalletCoinEntitySSJ);

                                    ZhiyaRewardEntity zhiyaRewardEntitySSJ = new ZhiyaRewardEntity();
@@ -454,8 +460,6 @@
                                    zhiyaRewardEntitySSJ.setRewardAmout(multiplySSJ);
                                    zhiyaRewardDao.insert(zhiyaRewardEntitySSJ);
                                }
                            }else{
                                multiplyReward = (zhiYaRecordEntity.getZhiyaCnt().multiply(gusdReward));
                            }
                            zhiyaRewardEntity.setRewardAmout(multiplyReward);
                            zhiyaRewardDao.insert(zhiyaRewardEntity);