20210226 指纹和消息提醒功能

xiaoyong931011

2021-02-26 ce9b2b7009c7a140fbbb05d40e2e4f67c0c95cbe

20210226  指纹和消息提醒功能

 src/main/java/com/xcong/excoin/common/system/controller/LoginController.java

@@ -16,8 +16,10 @@
import com.xcong.excoin.common.system.bean.LoginUserBean;
import com.xcong.excoin.common.system.dto.LoginDto;
import com.xcong.excoin.common.system.dto.RegisterDto;
import com.xcong.excoin.common.system.vo.MemberInfoVo;
import com.xcong.excoin.configurations.properties.ApplicationProperties;
import com.xcong.excoin.configurations.properties.SecurityProperties;
import com.xcong.excoin.modules.member.entity.MemberEntity;
import com.xcong.excoin.modules.member.service.MemberService;
import com.xcong.excoin.utils.RedisUtils;
import io.swagger.annotations.Api;
@@ -94,14 +96,21 @@
        redisUtils.set(redisToken, JSONObject.toJSONString(loginUserBean.getMemberEntity()), applicationProperties.getRedisExpire());
        redisUtils.set(redisMember, token);
        Map<String, Object> authInfo = new HashMap<>();
        //获取返回的个人信息
        MemberInfoVo memberInfoVo = new MemberInfoVo();
        MemberEntity memberEntity = loginUserBean.getMemberEntity();
        memberInfoVo.setEmail(memberEntity.getEmail());
        memberInfoVo.setPhone(memberEntity.getPhone());
        memberInfoVo.setInviteId(memberEntity.getInviteId());
        memberInfoVo.setFingerprintState(memberEntity.getFingerprintState());
        // 开启debug模式，则将加密后的token返回
        if (applicationProperties.isDebug()) {
            authInfo.put("token", token);
            authInfo.put("rsaToken", AppContants.TOKEN_START_WITH + generateAsaToken(token));
            authInfo.put("user", loginUserBean);
            authInfo.put("user", memberInfoVo);
        } else {
            authInfo.put("token", token);
            authInfo.put("user", loginUserBean);
            authInfo.put("user", memberInfoVo);
        }
        return Result.ok("success", authInfo);
    }

 src/main/java/com/xcong/excoin/common/system/vo/MemberInfoVo.java

New file
@@ -0,0 +1,34 @@
package com.xcong.excoin.common.system.vo;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@ApiModel(value = "MemberInfoVo", description = "返回类")
public class MemberInfoVo {

    /**
     * 手机号(包含国际手机号)
     */
    @ApiModelProperty("手机号")
    private String phone;

    /**
     * 邮箱
     */

    @ApiModelProperty("邮箱")
    private String email;
    /**
     * 邀请码
     */
    @ApiModelProperty("邀请码")
    private String inviteId;
    /**
     * 指纹解锁功能  1：是   0:否
     */
    @ApiModelProperty("指纹解锁功能  1：是   0:否")
    private Integer fingerprintState;

}

 src/main/java/com/xcong/excoin/modules/documentary/service/impl/FollowOrderOperationServiceImpl.java

@@ -26,11 +26,9 @@
import com.xcong.excoin.modules.documentary.service.FollowOrderOperationService;
import com.xcong.excoin.modules.member.dao.MemberDao;
import com.xcong.excoin.modules.member.dao.MemberLevelRateDao;
import com.xcong.excoin.modules.member.dao.MemberSettingDao;
import com.xcong.excoin.modules.member.dao.MemberWalletContractDao;
import com.xcong.excoin.modules.member.entity.AgentReturnEntity;
import com.xcong.excoin.modules.member.entity.MemberEntity;
import com.xcong.excoin.modules.member.entity.MemberLevelRateEntity;
import com.xcong.excoin.modules.member.entity.MemberWalletContractEntity;
import com.xcong.excoin.modules.member.entity.*;
import com.xcong.excoin.modules.platform.entity.PlatformTradeSettingEntity;
import com.xcong.excoin.rabbit.pricequeue.OrderModel;
import com.xcong.excoin.rabbit.producer.OrderProducer;
@@ -79,6 +77,8 @@
    private RabbitOrderService rabbitOrderService;
    @Resource
    private MemberLevelRateDao memberLevelRateDao;
    @Resource
    private MemberSettingDao memberSettingDao;


    @Override
@@ -211,6 +211,10 @@
                        LogRecordUtils.insertMemberAccountFlow(memberEntity.getId(), prePaymentAmount, walletContract.getAvailableBalance().subtract(prePaymentAmount), holdOrderEntity.getSymbol(), "买跌持仓", "买跌:" + holdOrderEntity.getSymbol());
                        LogRecordUtils.insertFollowerNotice(memberEntity.getId(), NoticeConstant.OPEN_ORDER_TITLE, StrUtil.format(NoticeConstant.OPEN_ORDER_CONTENT, holdOrderEntity.getSymbol() + "开空", openPrice, followTraderInfoEntity.getNickname()));
                    }
                    //更新更新消息提醒的状态
                    MemberSettingEntity memberSettingEntity = memberSettingDao.selectById(memberEntity.getId());
                    memberSettingEntity.setMessageReminder(1);
                    memberSettingDao.updateById(memberSettingEntity);
                }
            }
        }

 src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java

@@ -3,6 +3,8 @@
import javax.annotation.Resource;

import javax.validation.Valid;



import com.xcong.excoin.modules.member.parameter.dto.*;

import com.xcong.excoin.modules.member.parameter.vo.*;

import org.springframework.web.bind.annotation.GetMapping;

import org.springframework.web.bind.annotation.PostMapping;

import org.springframework.web.bind.annotation.RequestBody;

@@ -10,32 +12,6 @@
import org.springframework.web.bind.annotation.RestController;



import com.xcong.excoin.common.response.Result;

import com.xcong.excoin.modules.member.parameter.dto.MemberAddCoinAddressDto;

import com.xcong.excoin.modules.member.parameter.dto.MemberAddCoinAddressInDto;

import com.xcong.excoin.modules.member.parameter.dto.MemberAuthenticationDto;

import com.xcong.excoin.modules.member.parameter.dto.MemberBindEmailDto;

import com.xcong.excoin.modules.member.parameter.dto.MemberBindPhoneDto;

import com.xcong.excoin.modules.member.parameter.dto.MemberDelCoinAddressDto;

import com.xcong.excoin.modules.member.parameter.dto.MemberDelPaymethodDto;

import com.xcong.excoin.modules.member.parameter.dto.MemberForgetPwdDto;

import com.xcong.excoin.modules.member.parameter.dto.MemberPaymethodDto;

import com.xcong.excoin.modules.member.parameter.dto.MemberSubmitCoinApplyDto;

import com.xcong.excoin.modules.member.parameter.dto.MemberSubmitCoinApplyInDto;

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.AppVersionListVo;

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;

import com.xcong.excoin.modules.member.parameter.vo.MemberCoinAddressInListVo;

import com.xcong.excoin.modules.member.parameter.vo.MemberCoinAddressListVo;

import com.xcong.excoin.modules.member.parameter.vo.MemberCoinInfoListVo;

import com.xcong.excoin.modules.member.parameter.vo.MemberInfoVo;

import com.xcong.excoin.modules.member.parameter.vo.MemberPaymethodDetailListVo;

import com.xcong.excoin.modules.member.parameter.vo.MemberPaymethodDetailVo;

import com.xcong.excoin.modules.member.parameter.vo.MemberPersonCenterInfoVo;

import com.xcong.excoin.modules.member.parameter.vo.MemberSendCodeWayVo;

import com.xcong.excoin.modules.member.service.MemberService;



import io.swagger.annotations.Api;

@@ -356,6 +332,27 @@
    public Result memberPersonCenterInfo() {

        return memberService.memberPersonCenterInfo();

    }



    /**

     * 指纹解锁功能保存

     */

    @ApiOperation(value="指纹解锁功能保存", notes="指纹解锁功能保存")

    @PostMapping(value="/memberFingerprintState")

    public Result memberFingerprintState(@RequestBody @Valid MemberFingerprintStateDto memberFingerprintStateDto) {

        return memberService.memberFingerprintState(memberFingerprintStateDto);

    }



    /**

     * 获取消息提醒的状态

     */

    @ApiOperation(value = "获取消息提醒的状态", notes = "获取消息提醒的状态")

    @ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberMessageReminderVo.class)})

    @GetMapping(value = "/memberMessageReminder")

    public Result memberMessageReminder() {

        return memberService.memberMessageReminder();

    }



    /**

    

    /**

     * 提币币种信息


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

@@ -178,4 +178,9 @@
     * 合约仓位类型
     */
    private Integer contractPositionType;

    /**
     * 指纹解锁功能  1：是   0:否
     */
    private Integer fingerprintState;
}

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

@@ -30,5 +30,9 @@
     * 强平系数
     */
    private BigDecimal forceParam;
    /**
     * 跟单消息提醒0:没有  1：有
     */
    private Integer messageReminder;

}

 src/main/java/com/xcong/excoin/modules/member/parameter/dto/MemberFingerprintStateDto.java

New file
@@ -0,0 +1,14 @@
package com.xcong.excoin.modules.member.parameter.dto;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@ApiModel(value = "MemberFingerprintStateDto", description = "参数接收类")
public class MemberFingerprintStateDto {

    @ApiModelProperty(value = "是否开启0：否  1：是", example = "0")
    private Integer fingerprintState;

}

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

New file
@@ -0,0 +1,15 @@
package com.xcong.excoin.modules.member.parameter.vo;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@ApiModel(value = "MemberMessageReminderVo", description = "信息")
public class MemberMessageReminderVo {


    @ApiModelProperty(value = " 新的跟单消息提醒  1：是   0:否")
    private Integer messageReminder;

}

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

@@ -25,6 +25,9 @@


    @ApiModelProperty(value = "交易密码时效性设置1:一直需要输入密码  2不需要输入密码")

    private Integer tradeAgingSetting;



    @ApiModelProperty(value = " 指纹解锁功能  1：是   0:否")

    private Integer fingerprintState;

    /**

     * 一直需要输入密码

     */


 src/main/java/com/xcong/excoin/modules/member/service/MemberService.java

@@ -6,20 +6,7 @@
import com.xcong.excoin.common.response.Result;

import com.xcong.excoin.common.system.dto.RegisterDto;

import com.xcong.excoin.modules.member.entity.MemberEntity;

import com.xcong.excoin.modules.member.parameter.dto.MemberAddCoinAddressDto;

import com.xcong.excoin.modules.member.parameter.dto.MemberAddCoinAddressInDto;

import com.xcong.excoin.modules.member.parameter.dto.MemberAuthenticationDto;

import com.xcong.excoin.modules.member.parameter.dto.MemberBindEmailDto;

import com.xcong.excoin.modules.member.parameter.dto.MemberBindPhoneDto;

import com.xcong.excoin.modules.member.parameter.dto.MemberDelCoinAddressDto;

import com.xcong.excoin.modules.member.parameter.dto.MemberDelPaymethodDto;

import com.xcong.excoin.modules.member.parameter.dto.MemberForgetPwdDto;

import com.xcong.excoin.modules.member.parameter.dto.MemberPaymethodDto;

import com.xcong.excoin.modules.member.parameter.dto.MemberSubmitCoinApplyDto;

import com.xcong.excoin.modules.member.parameter.dto.MemberSubmitCoinApplyInDto;

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.dto.*;

import com.xcong.excoin.modules.member.parameter.vo.NeedMoneyMemberVo;

import org.apache.ibatis.annotations.Param;



@@ -100,5 +87,8 @@


    public Result memberCoinAddressInList();



    public Result memberFingerprintState(@Valid MemberFingerprintStateDto memberFingerprintStateDto);



    public Result memberMessageReminder();



}


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

@@ -18,20 +18,7 @@
import com.xcong.excoin.modules.contract.entity.ContractEntrustOrderEntity;
import com.xcong.excoin.modules.member.dao.*;
import com.xcong.excoin.modules.member.entity.*;
import com.xcong.excoin.modules.member.parameter.dto.MemberAddCoinAddressDto;
import com.xcong.excoin.modules.member.parameter.dto.MemberAddCoinAddressInDto;
import com.xcong.excoin.modules.member.parameter.dto.MemberAuthenticationDto;
import com.xcong.excoin.modules.member.parameter.dto.MemberBindEmailDto;
import com.xcong.excoin.modules.member.parameter.dto.MemberBindPhoneDto;
import com.xcong.excoin.modules.member.parameter.dto.MemberDelCoinAddressDto;
import com.xcong.excoin.modules.member.parameter.dto.MemberDelPaymethodDto;
import com.xcong.excoin.modules.member.parameter.dto.MemberForgetPwdDto;
import com.xcong.excoin.modules.member.parameter.dto.MemberPaymethodDto;
import com.xcong.excoin.modules.member.parameter.dto.MemberSubmitCoinApplyDto;
import com.xcong.excoin.modules.member.parameter.dto.MemberSubmitCoinApplyInDto;
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.dto.*;
import com.xcong.excoin.modules.member.parameter.vo.*;
import com.xcong.excoin.modules.member.service.MemberService;
import com.xcong.excoin.modules.platform.dao.PlatformFeeSettingDao;
@@ -803,6 +790,9 @@
            memberPersonCenterInfoVo.setTradeAgingSetting(MemberPersonCenterInfoVo.PWD_NEED_NO);
        }

        Integer fingerprintState = member.getFingerprintState();
        memberPersonCenterInfoVo.setFingerprintState(fingerprintState);

        return Result.ok(memberPersonCenterInfoVo);
    }

@@ -1141,6 +1131,29 @@
        return Result.ok(arrayList);
    }

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

        Integer fingerprintState = memberFingerprintStateDto.getFingerprintState();
        MemberEntity memberEntity = memberDao.selectById(memberId);
        memberEntity.setFingerprintState(fingerprintState);
        memberDao.updateById(memberEntity);
        return Result.ok(MessageSourceUtils.getString("member_service_0024"));
    }

    @Override
    public Result memberMessageReminder() {
        //获取用户ID
        Long memberId = LoginUserUtils.getAppLoginUser().getId();
        MemberSettingEntity selectById = memberSettingDao.selectById(memberId);
        MemberMessageReminderVo memberMessageReminderVo = new MemberMessageReminderVo();
        memberMessageReminderVo.setMessageReminder(selectById.getMessageReminder());
        return Result.ok(memberMessageReminderVo);
    }


}