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

xiaoyong931011

2021-05-14 c5ac51a5525b261127845a38a1fec5a86c860441

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

@@ -10,12 +10,15 @@
import com.xcong.excoin.modules.member.entity.MemberEntity;
import com.xcong.excoin.modules.member.entity.MemberWalletCoinEntity;
import com.xcong.excoin.modules.yunding.dao.YdBasicLevelSettingDao;
import com.xcong.excoin.modules.yunding.dao.YdBasicSettingDao;
import com.xcong.excoin.modules.yunding.dao.YdOrderDao;
import com.xcong.excoin.modules.yunding.dao.YdProductDao;
import com.xcong.excoin.modules.yunding.entity.YdBasicLevelSettingEntity;
import com.xcong.excoin.modules.yunding.entity.YdBasicSettingEntity;
import com.xcong.excoin.modules.yunding.entity.YdOrderEntity;
import com.xcong.excoin.modules.yunding.entity.YdProductEntity;
import com.xcong.excoin.modules.yunding.service.XchProfitService;
import com.xcong.excoin.rabbit.producer.YunDingProducter;
import com.xcong.excoin.utils.LogRecordUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -44,6 +47,12 @@
    @Autowired
    private YdBasicLevelSettingDao ydBasicLevelSettingDao;

    @Autowired
    private YunDingProducter yunDingProducter;

    @Autowired
    private YdBasicSettingDao ydBasicSettingDao;

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void autoBeAgent(Long id) {
@@ -68,7 +77,7 @@
                        update.setAgentLevel(2);
                        memberDao.updateById(update);
                    }
                } else if (memberEntity.getAgentLevel() != null && member.getAgentLevel() == 2){
                } else if (memberEntity.getAgentLevel() != null && memberEntity.getAgentLevel() == 2){
                    // 判断是否达到总代标准
                    if(becomeZd(memberEntity, settings.get(0))) {
                        update.setAgentLevel(1);
@@ -147,6 +156,8 @@
    public void usdtProfitDistributorByOrderId(Long id) {
        YdOrderEntity ydOrderEntity = ydOrderDao.selectById(id);
        usdtProfitDistributor(ydOrderEntity);

        yunDingProducter.sendYunDingAutoAgent(ydOrderEntity.getMemberId());
    }

    private void usdtProfitDistributor(YdOrderEntity order) {
@@ -171,6 +182,21 @@
            updateOrder.setId(order.getId());
            ydOrderDao.updateById(updateOrder);
        }

        List<MemberEntity> partners = memberDao.selectPartnerMemberList();
        YdBasicSettingEntity setting = ydBasicSettingDao.selectById(1L);
        if (CollUtil.isNotEmpty(partners)) {
            BigDecimal returnAmount = order.getAmount().multiply(setting.getPartnerRatio()).divide(BigDecimal.valueOf(partners.size()), 8, BigDecimal.ROUND_DOWN);
            log.info("合伙人分红:{}", returnAmount);
            for (MemberEntity partner : partners) {
                String conent = "合伙人USDT分红";
                LogRecordUtils.insertMemberAccountMoneyChangeWithId(partner.getId(), conent, returnAmount, "USDT", 1, 9, order.getId());
                MemberWalletCoinEntity walletCoin = memberWalletCoinDao.selectWalletCoinBymIdAndCode(partner.getId(), "USDT");

                memberWalletCoinDao.updateBlockBalance(walletCoin.getId(), returnAmount, BigDecimal.ZERO, 0);
            }
        }

    }

    private Map<Long, BigDecimal> buildReturnRatioObj(List<MemberEntity> agents, int type) {
@@ -257,11 +283,12 @@
                        }
                    }

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

                    ydOrderDao.updateOrderProfit(remainProfit, order.getId());
                    memberWalletCoinDao.updateBlockBalance(walletCoin.getId(), remainProfit, BigDecimal.ZERO, 0);
                }
            }