Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin

Helius

2020-06-29 1598aa79d68143f73c1b406f463c55e5e5d02433

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

@@ -459,6 +459,17 @@
        if (!MemberEntity.CERTIFY_STATUS_Y.equals(member.getCertifyStatus())) {
            return Result.fail(MessageSourceUtils.getString("member_service_0077"));
        }
        
        Map<String, Object> columnMap = new HashMap<>();
        columnMap.put("member_id", memberId);
      List<MemberPaymentMethodEntity> selectByMap = memberPaymentMethodDao.selectByMap(columnMap);
      if(CollUtil.isNotEmpty(selectByMap)) {
         for(MemberPaymentMethodEntity memberPaymentMethodEntity : selectByMap) {
            if(memberPaymethodDto.getAccount().equals(memberPaymentMethodEntity.getAccount())) {
               return Result.fail(MessageSourceUtils.getString("member_service_0097"));
            }
         }
      }
        String account = memberPaymethodDto.getAccount();
        String bank = memberPaymethodDto.getBank();
        String name = memberPaymethodDto.getName();
@@ -887,19 +898,20 @@

   @Override
   public Result getAppVersionInfo() {
      Map<String, Object> columnMap = new HashMap<>();
      List<AppVersionEntity> selectByMap = appVersionDao.selectByMap(columnMap);
      AppVersionVo appVersionVo = new AppVersionVo();
   Map<String, Object> columnMap = new HashMap<>();
   List<AppVersionEntity> selectByMap = appVersionDao.selectByMap(columnMap);
   List<Object> arrayList = new ArrayList<>(); 
      if(CollUtil.isNotEmpty(selectByMap)) {
         for(AppVersionEntity appVersionEntity : selectByMap) {
            appVersionVo.setAddress(appVersionEntity.getAddress());
            appVersionVo.setType(appVersionEntity.getType());
            appVersionVo.setVersion(appVersionEntity.getVersion());
               AppVersionVo appVersionVo = new AppVersionVo();
               appVersionVo.setAddress(appVersionEntity.getAddress());
               appVersionVo.setType(appVersionEntity.getType());
               appVersionVo.setVersion(appVersionEntity.getVersion());
               arrayList.add(appVersionVo);
            }
         }
      }
      return Result.ok(appVersionVo);
   return Result.ok(arrayList);
   }

}