20210517 云顶

xiaoyong931011

2021-05-17 7572b8dbd4c41ca9b6437a032da2aa1a0fdd5444

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

@@ -45,6 +45,8 @@
import com.xcong.excoin.modules.member.vo.MemberQuickBuySaleVo;
import com.xcong.excoin.modules.member.vo.MemberQuickSaleVo;

import com.xcong.excoin.modules.yunding.entity.BasicLevelSettingEntity;
import com.xcong.excoin.modules.yunding.mapper.BasicLevelSettingMapper;
import lombok.RequiredArgsConstructor;
import java.math.BigDecimal;
import java.text.DecimalFormat;
@@ -90,6 +92,8 @@
   private final MemberAuthenticationMapper memberAuthenticationMapper;
   
   private final AgentFriendRelationMapper agentFriendRelationMapper;

   private final BasicLevelSettingMapper basicLevelSettingMapper;
   
   @Override
   public IPage<AgentFriendRelationEntity> findAgentInfoListInPage(AgentFriendRelationEntity agentFriendRelationEntity,
@@ -206,6 +210,10 @@
              String firstName = (memberEntitys.getFirstName() == null ? "" : memberEntitys.getFirstName());
              String secondName = (memberEntitys.getSecondName() == null ? "" : memberEntitys.getSecondName());
              memberEntitys.setRealName(firstName+secondName);
            if (memberEntitys.getAgentLevel() != null) {
               BasicLevelSettingEntity agent = basicLevelSettingMapper.selectById(memberEntitys.getAgentLevel().longValue());
               memberEntitys.setAgentName(agent.getName());
            }
           }
        }
        return selectMemberListInPage;
@@ -514,23 +522,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);