20210528

xiaoyong931011

2021-05-28 5b4b266dce808935d58a04d8f2190d3dc773fde9

 src/main/java/com/xcong/excoin/modules/yunding/service/Impl/XchProfitServiceImpl.java

@@ -110,8 +110,13 @@
            }
        }

        BigDecimal needPower = basicLevelSetting.getCalculationPower().multiply(BigDecimal.valueOf(1024));
        return totalPower.compareTo(needPower) > 0;
        BigDecimal needPower = BigDecimal.ZERO;
        if ("P".equals(basicLevelSetting.getUnit())) {
            needPower = basicLevelSetting.getCalculationPower().multiply(BigDecimal.valueOf(1024));
        } else {
            needPower = basicLevelSetting.getCalculationPower();
        }
        return totalPower.compareTo(needPower) >= 0;
    }

    /**
@@ -217,6 +222,7 @@
    private Map<Long, BigDecimal> buildReturnRatioObj(List<MemberEntity> agents, int type) {
        Map<Long, BigDecimal> returnRatio = new HashMap<Long, BigDecimal>();
        Long lastId = null;
        int i = 0;
        for (MemberEntity agent : agents) {
            YdBasicLevelSettingEntity settingEntity = agent.getYdBasicLevelSettingEntity();

@@ -228,12 +234,20 @@
            }
            if(settingEntity.getLevel() == 1) {
                if (CollUtil.isNotEmpty(returnRatio)) {
                    BigDecimal lastRatio = returnRatio.get(lastId);
                    returnRatio.put(agent.getId(), ratio.subtract(lastRatio));
                    if (i != 0) {
                        returnRatio.put(agent.getId(), BigDecimal.valueOf(0.01));
                    } else {
                        BigDecimal lastRatio = returnRatio.get(lastId);
                        returnRatio.put(agent.getId(), ratio.subtract(lastRatio));
                    }
                } else {
                    returnRatio.put(agent.getId(), ratio);
                }
                break;

                if (i >= 1) {
                    break;
                }
                i++;
            }

            if (CollUtil.isEmpty(returnRatio)) {
@@ -265,6 +279,9 @@
            BigDecimal unitProfit = totalProfit.divide(totalCount, 8, BigDecimal.ROUND_DOWN);
            log.info("单位XCH收益:{}", unitProfit);

            List<MemberEntity> partners = memberDao.selectPartnerMemberList();
            YdBasicSettingEntity setting = ydBasicSettingDao.selectById(1L);

            List<YdOrderEntity> orders = ydOrderDao.selectAllValidOrders();
            if (CollUtil.isNotEmpty(orders)) {
                for (YdOrderEntity order : orders) {
@@ -281,6 +298,8 @@
                    if ("P".equals(order.getYdProductEntity().getProUnit())) {
                        count = count.multiply(BigDecimal.valueOf(1024));
                    }

                    // 订单总收益
                    BigDecimal orderProfit = count.multiply(unitProfit);
                    BigDecimal remainProfit = orderProfit;
                    if (CollUtil.isNotEmpty(agents)) {
@@ -298,6 +317,17 @@
                        }
                    }

                    BigDecimal partnerAmount = orderProfit.multiply(setting.getPartnerXchRatio());
                    remainProfit = remainProfit.subtract(partnerAmount);
                    // 合伙人收益
                    if (CollUtil.isNotEmpty(partners)) {
                        BigDecimal unitPartnerAmount = partnerAmount.divide(BigDecimal.valueOf(partners.size()), 8, BigDecimal.ROUND_DOWN);
                        for (MemberEntity partner : partners) {
                            String conent = "合伙人XCH分红";
                            LogRecordUtils.insertMemberAccountMoneyChangeWithId(partner.getId(), conent, unitPartnerAmount, "XCH", 1, 10, order.getId());
                        }
                    }

                    remainProfit = remainProfit.subtract(orderProfit.multiply(order.getYdProductEntity().getManageExpense()));
                    String content = "XCH收益";
                    LogRecordUtils.insertMemberAccountMoneyChangeWithId(order.getMemberId(), content, remainProfit, "XCH", 1, 4, order.getId());