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

Helius

2020-07-01 77f844f85e90ee6ae98c5f9c3d24f31d541db2f9

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

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

@@ -568,9 +568,16 @@
            if (!commonservice.verifyCode(phone, code)) {
                return Result.fail(MessageSourceUtils.getString("member_service_0013"));
            }
            Map<String, Object> columnMap = new HashMap<>();
            columnMap.put("phone", phone);
            List<MemberEntity> selectByMap = memberDao.selectByMap(columnMap );
            if(CollUtil.isEmpty(selectByMap)) {
            member.setPhone(phone);
            memberDao.updateById(member);
            return Result.ok(MessageSourceUtils.getString("member_service_0014"));
            }else {
                return Result.fail(MessageSourceUtils.getString("member_service_1400"));
            }
        }

        return Result.fail(MessageSourceUtils.getString("member_service_0015"));
@@ -589,9 +596,16 @@
        boolean flag = commonservice.verifyCode(email, code);
        if (ObjectUtil.isNotEmpty(member)) {
            if (flag) {
                Map<String, Object> columnMap = new HashMap<>();
                columnMap.put("email", email);
                List<MemberEntity> selectByMap = memberDao.selectByMap(columnMap );
                if(CollUtil.isEmpty(selectByMap)) {
                member.setEmail(email);
                memberDao.updateById(member);
                return Result.ok(MessageSourceUtils.getString("member_service_0018"));
                }else {
                    return Result.fail(MessageSourceUtils.getString("member_service_1400"));
                }
            }
        }
        return Result.fail(MessageSourceUtils.getString("member_service_0019"));
@@ -879,7 +893,7 @@
                 */
                return Result.ok(MessageSourceUtils.getString("member_service_0086"));
            } else {
                return Result.fail(MessageSourceUtils.getString("member_service_0038"));
                return Result.fail(MessageSourceUtils.getString("member_service_0005"));
            }

        } else {

 src/main/resources/i18n/messages_en_US.properties

@@ -44,7 +44,8 @@
member_service_0011=Fail in send

member_service_0012=The verification code has expired, please request again

member_service_0013=Wrong verification code

member_service_0014=Phone number binding succeeded

member_service_0014=Binding succeeded

member_service_1400=Binding fail

member_service_0015=Submit failed

member_service_0016=Mailbox cannot be empty

member_service_0017=Verification code cannot be empty


 src/main/resources/i18n/messages_zh_CN.properties

@@ -44,7 +44,8 @@
member_service_0011=发送失败

member_service_0012=验证码已失效，请重新请求

member_service_0013=验证码有误

member_service_0014=手机号绑定成功

member_service_0014=绑定成功

member_service_1400=绑定失败

member_service_0015=提交失败

member_service_0016=邮箱不能为空

member_service_0017=验证码不能为空