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

Helius

2020-06-12 3296d920915860e934e5620488e80e536e168a40

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

 src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java

@@ -373,7 +373,6 @@
        memberAccountMoneyChange.setMemberId(memberId);

        IPage<MemberAccountMoneyChange> list = memberAccountMoneyChangeDao.selectWalletContractRecordsInPage(page, memberAccountMoneyChange);

        Page<MemberAccountMoneyChangeInfoVo> pageEntityToPageVo = MemberAccountMoneyChangeMapper.INSTANCE.pageEntityToPageVo(list);

        
        return Result.ok(pageEntityToPageVo);

    }




 src/main/java/com/xcong/excoin/modules/home/controller/MemberQuickBuySaleController.java

@@ -42,9 +42,9 @@
        MemberEntity member = LoginUserUtils.getAppLoginUser();

        log.info("查询到的会员----->{}", member);

        // 验证是否实名认证

        if (MemberEntity.CERTIFY_STATUS_Y.equals(member.getCertifyStatus())) {

            return Result.fail("请先实名认证");

        }

        //if (!MemberEntity.CERTIFY_STATUS_Y.equals(member.getCertifyStatus())) {

        //    return Result.fail("请先实名认证");

        //}

        String tradePasswordWeb = memberQuickBuySaleDto.getTradePassword();

        

        // 验证支付密码


 src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java

@@ -45,7 +45,7 @@
    /**
     * 实名认证 审核通过
     */
    public static final Integer CERTIFY_STATUS_Y = 1;
    public static final Integer CERTIFY_STATUS_Y = 2;
    /**
     * 实名认证 审核不通过
     */
@@ -53,7 +53,7 @@
    /**
     * 实名认证 审核中
     */
    public static final Integer CERTIFY_STATUS_ING = 2;
    public static final Integer CERTIFY_STATUS_ING = 1;
    /**
     * 实名认证 未提交
     */

 src/main/java/com/xcong/excoin/modules/member/parameter/vo/MemberAuthenticationInfoVo.java

@@ -8,7 +8,7 @@
@ApiModel(value = "MemberAuthenticationInfoVo", description = "实名认证信息")

public class MemberAuthenticationInfoVo {

    

    @ApiModelProperty(value = "实名认证状态 0-审核未通过 1-审核通过 2-等待审核")

    @ApiModelProperty(value = "实名认证状态 0-审核未通过 1-审核中 2-审核通过")

    private Integer certifyStatus;

    

    @ApiModelProperty(value = "姓")


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

@@ -742,8 +742,6 @@

    @Override
    public Result memberCoinInfoList() {
        //获取用户ID
        Long memberId = LoginUserUtils.getAppLoginUser().getId();

        MemberCoinInfoListVo memberCoinInfoListVo = new MemberCoinInfoListVo();
        List<PlatformSymbolsCoinEntity> selectByMap = platformSymbolsCoinDao.selectByMap(new HashMap<>());