20210512 云顶

xiaoyong931011

2021-05-12 22210a5cf2fab56cf129fd313cfe448a2c2ef86b

20210512 云顶

 src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java

@@ -514,23 +514,32 @@
        memberWalletCoinMapper.updateById(walletCoin);
        
        if ("Y".equals(selectById.getIsInside())) {
            Map<String, Object> columnMap = new HashMap<>();
            columnMap.put("symbol", symbol);
            columnMap.put("address", address);
            // 如果是内部转账 则需要将币加到内部地址
            List<MemberCoinAddressEntity> selectByMap = memberCoinAddressMapper.selectByMap(columnMap);

            Long aimMemberId = null;
            if(CollUtil.isEmpty(selectByMap)) {
//                return new FebsResponse().message("地址有误，请拒绝！");
//                throw new GlobalException("地址有误，请拒绝！");
                MemberEntity memberEntity = memberMapper.selectMemberInfoByQueryKey(address);
            if(symbol.equals("XCH")){
                MemberEntity memberEntity = memberMapper.selectMemberByInviteId(address);
                if (memberEntity == null) {
                    throw new GlobalException("地址有误或用户不存在，请拒绝！");
                }

                aimMemberId = memberEntity.getId();
            } else {
                aimMemberId = selectByMap.get(0).getMemberId();
            }else{
                Map<String, Object> columnMap = new HashMap<>();
                columnMap.put("symbol", symbol);
                columnMap.put("address", address);
                // 如果是内部转账 则需要将币加到内部地址
                List<MemberCoinAddressEntity> selectByMap = memberCoinAddressMapper.selectByMap(columnMap);
                if(CollUtil.isEmpty(selectByMap)) {
//                return new FebsResponse().message("地址有误，请拒绝！");
//                throw new GlobalException("地址有误，请拒绝！");
                    MemberEntity memberEntity = memberMapper.selectMemberInfoByQueryKey(address);
                    if (memberEntity == null) {
                        throw new GlobalException("地址有误或用户不存在，请拒绝！");
                    }

                    aimMemberId = memberEntity.getId();
                } else {
                    aimMemberId = selectByMap.get(0).getMemberId();
                }
            }
            MemberWalletCoinEntity aimWalletCoin = memberWalletCoinMapper.findWalletCoinByMemberIdAndWalletCode(aimMemberId, symbol);
            

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

@@ -13,18 +13,21 @@
public class BasicLevelSettingEntity {
    private static final long serialVersionUID = 1L;

    @TableId(value = "id",type = IdType.AUTO)
    private Long id;
    //等级名称

    private String name;
    //等级编码

    private String code;
    //XCH返佣比例

    private BigDecimal xchRatio;
    //USDT返佣比例

    private BigDecimal usdtRatio;
    //成为代理条件（充值USDT的数量）

    private BigDecimal chargeUsdt;
    //成为代理条件（购买算力的数量）

    private BigDecimal calculationPower;

    private BigDecimal salePrice;

    private Integer level;
}