20200601 代码提交

xiaoyong931011

2020-06-01 b30a22e97dfe1a7c098123ec0dbbad1b99b7c885

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

@@ -25,6 +25,8 @@
import com.xcong.excoin.modules.member.parameter.dto.MemberPaymethodDto;
import com.xcong.excoin.modules.member.parameter.dto.MemberUpdatePwdDto;
import com.xcong.excoin.modules.member.parameter.dto.MemberUpdateTradePwdDto;
import com.xcong.excoin.modules.member.parameter.dto.MemberUpdateTradersPwdTimeDto;
import com.xcong.excoin.modules.member.parameter.vo.*;
import com.xcong.excoin.modules.member.parameter.vo.MemberAuthenticationInfoVo;
import com.xcong.excoin.modules.member.parameter.vo.MemberAvivableCoinInfoVo;
import com.xcong.excoin.modules.member.parameter.vo.MemberCoinAddressCountListVo;
@@ -97,16 +99,16 @@
    
    @Resource
    PlatformFeeSettingDao platformFeeSettingDao;
    

    @Resource
    MemberCoinAddressDao memberCoinAddressDao;
    
    @Resource
    private CommonService commonservice;
    

    @Resource
    private MemberWalletContractSimulateDao memberWalletContractSimulateDao;
    

    @Transactional()
    @Override
    public Result register(RegisterDto registerDto) {
@@ -150,7 +152,7 @@
        String ids = "";
        while (!flag) {
            ids += ("," + parentId);
            MemberEntity parentMember = memberDao.selectMemberInfoByRefererId(parentId);
            MemberEntity parentMember = memberDao.selectMemberInfoByInviteId(parentId);
            if (parentMember == null) {
                break;
            }
@@ -669,11 +671,11 @@
      //获取用户ID
      Long memberId = LoginUserUtils.getAppLoginUser().getId();
      MemberEntity member = memberDao.selectById(memberId);
		

      Map<String, Object> columnMap = new HashMap<>();
      columnMap.put("member_id", memberId);
      List<MemberAuthenticationEntity> selectByMap = memberAuthenticationDao.selectByMap(columnMap);
		

      MemberAuthenticationInfoVo memberAuthnticationInfoVo = new MemberAuthenticationInfoVo();
      memberAuthnticationInfoVo.setCertifyStatus(member.getCertifyStatus());
      if(CollUtil.isNotEmpty(selectByMap)) {
@@ -692,28 +694,33 @@
      //获取用户ID
      Long memberId = LoginUserUtils.getAppLoginUser().getId();
      MemberEntity member = memberDao.selectById(memberId);
		

      MemberPersonCenterInfoVo memberPersonCenterInfoVo = new MemberPersonCenterInfoVo();
      if(StrUtil.isNotEmpty(member.getPhone())) {
         memberPersonCenterInfoVo.setPhone(1);
      }else {
         memberPersonCenterInfoVo.setPhone(0);
      }
      memberPersonCenterInfoVo.setPhone(0);
		

      if(StrUtil.isNotEmpty(member.getEmail())) {
         memberPersonCenterInfoVo.setEmail(1);
      }else {
         memberPersonCenterInfoVo.setEmail(0);
      }
      memberPersonCenterInfoVo.setEmail(0);
		

      if(StrUtil.isNotEmpty(member.getTradePassword())) {
         memberPersonCenterInfoVo.setTradePassword(1);
      }else {
         memberPersonCenterInfoVo.setTradePassword(0);
      }
      memberPersonCenterInfoVo.setTradePassword(0);
      
      if(StrUtil.isNotEmpty(member.getTradeAgingSetting().toString())) {
      Integer tradeAgingSetting = member.getTradeAgingSetting();
      if(tradeAgingSetting != null && tradeAgingSetting == MemberPersonCenterInfoVo.PWD_NEED_FORVER) {
         memberPersonCenterInfoVo.setTradeAgingSetting(MemberPersonCenterInfoVo.PWD_NEED_FORVER);
      }else {
         memberPersonCenterInfoVo.setTradeAgingSetting(MemberPersonCenterInfoVo.PWD_NEED_NO);
      }
      memberPersonCenterInfoVo.setTradeAgingSetting(MemberPersonCenterInfoVo.PWD_NEED_FORVER);
		

      return Result.ok(memberPersonCenterInfoVo);
   }

@@ -721,7 +728,7 @@
   public Result memberCoinInfoList() {
      //获取用户ID
      Long memberId = LoginUserUtils.getAppLoginUser().getId();
		

      MemberCoinInfoListVo memberCoinInfoListVo = new MemberCoinInfoListVo();
      List<PlatformSymbolsCoinEntity> selectByMap = platformSymbolsCoinDao.selectByMap(new HashMap<>());
      List<MemberCoinInfoVo> arrayList = new ArrayList<>();
@@ -733,7 +740,7 @@
         }
      }
      memberCoinInfoListVo.setMemberCoinInfoVo(arrayList);
		

      return Result.ok(memberCoinInfoListVo);
   }

@@ -745,10 +752,10 @@
        if (ObjectUtil.isEmpty(walletCoin)) {
             return Result.fail(MessageSourceUtils.getString("member_service_0087"));
        }
          

        MemberAvivableCoinInfoVo memberAvivableCoinInfoVo = new MemberAvivableCoinInfoVo();
        memberAvivableCoinInfoVo.setAvailableBalance(walletCoin.getAvailableBalance());
          

        PlatformFeeSettingEntity feeSetting = platformFeeSettingDao.getFeeSettingByTypeAndSymbol(2,symbol);
        if(ObjectUtil.isEmpty(feeSetting)) {
           return Result.fail(MessageSourceUtils.getString("member_service_0087"));
@@ -757,4 +764,31 @@
        return Result.ok(memberAvivableCoinInfoVo);
    }

   @Override
   public NeedMoneyMemberVo selectFriendRelationUserByMemberId(Long memberId){
      return memberDao.selectFriendRelationUserByMemberId(memberId);
   }

   @Override
   public List<NeedMoneyMemberVo> selectAllNeedMoneyMember(List<String> list) {
      return memberDao.selectAllNeedMoneyMember(list);
   }

   @Override
   public MemberEntity selectMemberInfoByInviteId(String inviteId) {
      return memberDao.selectMemberInfoByInviteId(inviteId);
   }

   @Override
   @Transactional
   public Result memberUpdateTradersPwdTime(MemberUpdateTradersPwdTimeDto memberUpdateTradersPwdTimeDto) {
      //获取用户ID
      Long memberId = LoginUserUtils.getAppLoginUser().getId();
      MemberEntity member = memberDao.selectById(memberId);
      member.setTradeAgingSetting(memberUpdateTradersPwdTimeDto.getTradeAgingSetting());
      memberDao.updateById(member);
      return Result.ok("success");
   }


}