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

xiaoyong931011

2021-05-15 a8b2538db7172cc108b0a5387ea7c0da18046049

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

 src/main/java/com/xcong/excoin/modules/yunding/entity/YdBasicSettingEntity.java

@@ -42,5 +42,9 @@
     * XCH兑换USDT手续费
     */
    private BigDecimal changeXch;
    /**
     * 直推返利
     */
    private BigDecimal parentRatio;

}

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

@@ -4,6 +4,7 @@
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.xcong.excoin.common.contants.AppContants;
import com.xcong.excoin.modules.coin.dao.MemberAccountMoneyChangeDao;
import com.xcong.excoin.modules.member.dao.MemberDao;
import com.xcong.excoin.modules.member.dao.MemberWalletCoinDao;
@@ -18,6 +19,7 @@
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.netty.common.Contans;
import com.xcong.excoin.rabbit.producer.YunDingProducter;
import com.xcong.excoin.utils.LogRecordUtils;
import lombok.extern.slf4j.Slf4j;
@@ -183,6 +185,7 @@
            ydOrderDao.updateById(updateOrder);
        }

        // 合伙人分红
        List<MemberEntity> partners = memberDao.selectPartnerMemberList();
        YdBasicSettingEntity setting = ydBasicSettingDao.selectById(1L);
        if (CollUtil.isNotEmpty(partners)) {
@@ -197,6 +200,19 @@
            }
        }

        if(!AppContants.SYSTEM_REFERER.equals(memberEntity.getRefererId())) {
            // 直推返利
            MemberEntity parentNode = memberDao.selectMemberInfoByInviteId(memberEntity.getRefererId());
            if (parentNode != null) {
                BigDecimal parentAmount = order.getAmount().multiply(setting.getParentRatio());

                String conent = "直推USDT返利";
                LogRecordUtils.insertMemberAccountMoneyChangeWithId(parentNode.getId(), conent, parentAmount, "USDT", 1, 10, order.getId());
                MemberWalletCoinEntity walletCoin = memberWalletCoinDao.selectWalletCoinBymIdAndCode(parentNode.getId(), "USDT");

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

    private Map<Long, BigDecimal> buildReturnRatioObj(List<MemberEntity> agents, int type) {

 src/main/resources/application-test.yml

@@ -48,7 +48,7 @@
  ## redis配置
  redis:
    ## Redis数据库索引（默认为0）
    database: 3
    database: 4
    ## Redis服务器地址
    host: 121.37.162.173
    ## Redis服务器连接端口

 src/test/java/com/xcong/excoin/XchTest.java

@@ -60,7 +60,7 @@

    @Test
    public void orderUsdtProfitTest() {
        xchProfitService.usdtProfitDistributorByOrderId(1L);
        xchProfitService.usdtProfitDistributorByOrderId(17L);
    }
//
//    @Autowired