20210514 云顶

xiaoyong931011

2021-05-14 a7ff00c817968670223bb454617cd43d106d2b8d

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

@@ -16,6 +16,7 @@
import com.xcong.excoin.common.exception.GlobalException;
import com.xcong.excoin.modules.Sms106Send;
import com.xcong.excoin.modules.member.dto.MemberDetailConfirmDto;
import com.xcong.excoin.modules.member.entity.ActivityReceiveRecord;
import com.xcong.excoin.modules.member.entity.AgentFriendRelationEntity;
import com.xcong.excoin.modules.member.entity.MemberAccountMoneyChangeEntity;
import com.xcong.excoin.modules.member.entity.MemberAuthenticationEntity;
@@ -35,6 +36,7 @@
import com.xcong.excoin.modules.member.mapper.MemberQuickBuySaleMapper;
import com.xcong.excoin.modules.member.mapper.MemberWalletCoinMapper;
import com.xcong.excoin.modules.member.service.IMemberService;
import com.xcong.excoin.modules.member.vo.MemberActivityReceiveVo;
import com.xcong.excoin.modules.member.vo.MemberAuthenticationVo;
import com.xcong.excoin.modules.member.vo.MemberCoinChargeVo;
import com.xcong.excoin.modules.member.vo.MemberCoinWithdrawVo;
@@ -512,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);
         
@@ -2306,4 +2317,21 @@
      return selectMemberListInPage;
   }


   @Override
   public IPage<MemberActivityReceiveVo> memberActivityReceive(ActivityReceiveRecord activityReceiveRecord,
         QueryRequest request) {

      Page<ActivityReceiveRecord> page = new Page<>(request.getPageNum(), request.getPageSize());
      return memberMapper.memberActivityReceive(page, activityReceiveRecord);
   }


   @Override
   public IPage<ActivityReceiveRecord> seeReceiveInfo(QueryRequest request,
         ActivityReceiveRecord activityReceiveRecord) {
      Page<ActivityReceiveRecord> page = new Page<>(request.getPageNum(), request.getPageSize());
      return memberMapper.seeReceiveInfo(page, activityReceiveRecord);
   }

}