20222223

xiaoyong931011

2022-03-01 b6ddbc19480990940db85980278d3d5414ba5552

20222223

 src/main/java/com/xcong/excoin/modules/coin/controller/CoinController.java

@@ -25,7 +25,9 @@
@Api(value = "会员资产接口", tags = "会员资产接口")

@RestController

@RequestMapping(value = "/api/walletCoin")

public class CoinController {

public class



CoinController {

    

    @Resource

    private CoinService coinService;


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

@@ -227,15 +227,15 @@
                if(CollUtil.isNotEmpty(Arrays.asList(split))){
                    for(String str : strings){
                        if(StrUtil.isNotEmpty(str)){
                            BigDecimal isAgent = BigDecimal.ZERO;
//                            BigDecimal isAgent = BigDecimal.ZERO;
                            MemberEntity memberShangJi = memberdao.selectMemberInfoByInviteId(str);
                            ZhiYaTeam zhiyaTeamByMemberId = zhiYaRecordDao.selectZhiyaTeamRecordByMemberId(memberShangJi.getId());
                            if(ObjectUtil.isNotEmpty(zhiyaTeamByMemberId)){
                                //更新数据
                                zhiyaTeamByMemberId.setZhiyaCnt(zhiyaTeamByMemberId.getZhiyaCnt().add(balance));
                                if(isAgent.compareTo(gricetoagent) >= 0){
                                    zhiyaTeamByMemberId.setIsAgent(1);
                                }
//                                if(isAgent.compareTo(gricetoagent) >= 0){
//                                    zhiyaTeamByMemberId.setIsAgent(1);
//                                }
                                zhiyaTeamDao.updateById(zhiyaTeamByMemberId);
                            }else{
                                //新增数据
@@ -245,14 +245,14 @@
                                zhiYaTeam.setMemberId(memberShangJi.getId());
                                if(ObjectUtil.isNotEmpty(zhiyaTeamByMemberId)){
                                    zhiYaTeam.setZhiyaCnt(zhiyaTeamByMemberId.getZhiyaCnt().add(balance));
                                    isAgent = zhiyaTeamByMemberId.getZhiyaCnt().add(balance);
//                                    isAgent = zhiyaTeamByMemberId.getZhiyaCnt().add(balance);
                                }else{
                                    zhiYaTeam.setZhiyaCnt(balance);
                                    isAgent = balance;
//                                    isAgent = balance;
                                }
                                if(isAgent.compareTo(gricetoagent) >= 0){
                                    zhiYaTeam.setIsAgent(1);
                                }
//                                if(isAgent.compareTo(gricetoagent) >= 0){
//                                    zhiYaTeam.setIsAgent(1);
//                                }
                                zhiyaTeamDao.insert(zhiYaTeam);
                            }
                        }
@@ -310,22 +310,22 @@
            MemberEntity memberEntity = memberdao.selectById(memberId);
            String refererIds = memberEntity.getRefererIds();
            if(StrUtil.isNotEmpty(refererIds)){
                BigDecimal gricetoagent = new BigDecimal(redisUtils.getString("GRICETOAGENT"));
//                BigDecimal gricetoagent = new BigDecimal(redisUtils.getString("GRICETOAGENT"));
                String[] split = refererIds.split(",");
                List<String> strings = Arrays.asList(split);
                if(CollUtil.isNotEmpty(Arrays.asList(split))){
                    for(String str : strings){
                        if(StrUtil.isNotEmpty(str)){
                            BigDecimal isAgent = BigDecimal.ZERO;
//                            BigDecimal isAgent = BigDecimal.ZERO;
                            MemberEntity memberShangJi = memberdao.selectMemberInfoByInviteId(str);
                            ZhiYaTeam zhiyaTeamByMemberId = zhiYaRecordDao.selectZhiyaTeamRecordByMemberId(memberShangJi.getId());
                            if(ObjectUtil.isNotEmpty(zhiyaTeamByMemberId)){
                                //更新数据
                                zhiyaTeamByMemberId.setZhiyaCnt(zhiyaTeamByMemberId.getZhiyaCnt().subtract(balance));
                                isAgent = zhiyaTeamByMemberId.getZhiyaCnt().subtract(balance);
                                if(isAgent.compareTo(gricetoagent) >= 0){
                                    zhiyaTeamByMemberId.setIsAgent(1);
                                }
//                                isAgent = zhiyaTeamByMemberId.getZhiyaCnt().subtract(balance);
//                                if(isAgent.compareTo(gricetoagent) >= 0){
//                                    zhiyaTeamByMemberId.setIsAgent(1);
//                                }
                                zhiyaTeamDao.updateById(zhiyaTeamByMemberId);
                            }else{
                                //新增数据
@@ -335,14 +335,14 @@
                                zhiYaTeam.setMemberId(memberShangJi.getId());
                                if(ObjectUtil.isNotEmpty(zhiyaTeamByMemberId)){
                                    zhiYaTeam.setZhiyaCnt(zhiyaTeamByMemberId.getZhiyaCnt().subtract(balance));
                                    isAgent = zhiyaTeamByMemberId.getZhiyaCnt().subtract(balance);
//                                    isAgent = zhiyaTeamByMemberId.getZhiyaCnt().subtract(balance);
                                }else{
                                    zhiYaTeam.setZhiyaCnt(balance);
                                    isAgent = balance;
//                                    isAgent = balance;
                                }
                                if(isAgent.compareTo(gricetoagent) >= 0){
                                    zhiYaTeam.setIsAgent(1);
                                }
//                                if(isAgent.compareTo(gricetoagent) >= 0){
//                                    zhiYaTeam.setIsAgent(1);
//                                }
                                zhiyaTeamDao.insert(zhiYaTeam);
                            }
                        }

 src/main/java/com/xcong/excoin/quartz/job/ZhiyarRewardJob.java

@@ -21,8 +21,8 @@
    /**
     * 质押奖励计算
     */
//    @Scheduled(cron = "0 * * * * ? ")
    @Scheduled(cron = "0 0 0 * * ? ")
    @Scheduled(cron = "0 * * * * ? ")
//    @Scheduled(cron = "0 0 0 * * ? ")
    public void updateDoingPrice() {
        log.info("#质押奖励计算#");
        try {