src/main/java/cc/mrbird/febs/dapp/dto/ApiTransferPasswordDto.java
@@ -8,6 +8,21 @@ @ApiModel(value = "ApiTransferPasswordDto", description = "设置资金密码") public class ApiTransferPasswordDto { @ApiModelProperty(value = "真实姓名",example = "49546512") private String realname; @ApiModelProperty(value = "手机号码",example = "49546512") private String phone; @ApiModelProperty(value = "邮箱",example = "49546512") private String email; @ApiModelProperty(value = "wahtsApp",example = "49546512") private String wahtsApp; @ApiModelProperty(value = "telegram",example = "49546512") private String telegram; @ApiModelProperty(value = "旧资金密码",example = "49546512") private String oldTransferPassword;
@@ -93,4 +93,9 @@ private String transferCode; private Integer isProfit; private Integer isOnHook; private String realname; private String phone; private String wahtsApp; private String email; private String telegram; } src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java
@@ -218,10 +218,10 @@ BigDecimal availableAmount = dappWalletCoinEntity.getAvailableAmount(); //如果中奖，返回收益，如果没中奖，则返回本金,最后加上剩余总挂机金额 BigDecimal total = totalProfit.add(totalAmount).add(igtOnHookPlanOrder.getAvaAmount()).setScale(4, BigDecimal.ROUND_DOWN); dappWalletCoinDao.addTotalAndaddAvailableById(memberId,total); dappWalletCoinDao.addTotalAndaddAvailableById(dappWalletCoinEntity.getId(),total); //生成流水记录 BigDecimal add = availableAmount.add(total); BigDecimal subtract = add.subtract(totalAmount).subtract(igtOnHookPlanOrder.getAvaAmount()); BigDecimal subtract = add.subtract(totalAmount); DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(memberId, subtract, totalProfit, add, "投注盈利", 5); dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity); //更新用户表是否正在挂机状态字段为否 src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
@@ -699,6 +699,20 @@ @Override public FebsResponse transferPassword(ApiTransferPasswordDto apiTransferPasswordDto) { DappMemberEntity dappMemberEntity = LoginUserUtil.getAppUser(); Long memberId = dappMemberEntity.getId(); if(ObjectUtil.isEmpty(apiTransferPasswordDto.getRealname())){ return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_0013")); } if(ObjectUtil.isEmpty(apiTransferPasswordDto.getPhone())){ return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_0013")); } if(ObjectUtil.isEmpty(apiTransferPasswordDto.getEmail()) && ObjectUtil.isEmpty(apiTransferPasswordDto.getWahtsApp()) && ObjectUtil.isEmpty(apiTransferPasswordDto.getTelegram())){ return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_0013")); } if(ObjectUtil.isEmpty(apiTransferPasswordDto.getNewTransferPassword()) || ObjectUtil.isEmpty(apiTransferPasswordDto.getNewTransferPasswordAgain())){ return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_008")); @@ -708,11 +722,19 @@ if(!newTransferPassword.equals(newTransferPasswordAgain)){ return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_009")); } DappMemberEntity dappMemberEntity = LoginUserUtil.getAppUser(); Long memberId = dappMemberEntity.getId(); DappMemberEntity memberEntity = dappMemberDao.selectById(memberId); String realname = apiTransferPasswordDto.getRealname(); String phone = apiTransferPasswordDto.getPhone(); String email = apiTransferPasswordDto.getEmail(); String wahtsApp = apiTransferPasswordDto.getWahtsApp(); String telegram = apiTransferPasswordDto.getTelegram(); memberEntity.setTransferCode(SecureUtil.md5(apiTransferPasswordDto.getNewTransferPassword())); memberEntity.setRealname(realname); memberEntity.setPhone(phone); memberEntity.setEmail(email); memberEntity.setWahtsApp(wahtsApp); memberEntity.setTelegram(telegram); dappMemberDao.updateById(memberEntity); return new FebsResponse().success().message(MessageSourceUtils.getString("Operation_001")); src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
@@ -135,10 +135,10 @@ //如果中奖，返回收益，如果没中奖，则返回本金,最后加上剩余总挂机金额 BigDecimal total = totalProfit.add(totalAmount).add(igtOnHookPlanOrder.getAvaAmount()).setScale(4, BigDecimal.ROUND_DOWN); dappWalletCoinDao.addTotalAndaddAvailableById(memberId,total); dappWalletCoinDao.addTotalAndaddAvailableById(dappWalletCoinEntity.getId(),total); BigDecimal add = availableAmount.add(total); BigDecimal subtract = add.subtract(totalAmount).subtract(igtOnHookPlanOrder.getAvaAmount()); BigDecimal subtract = add.subtract(totalAmount); DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(memberId, subtract, totalProfit, add, "投注盈利", 5); dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity); } src/main/resources/i18n/message_en_US.properties
@@ -49,6 +49,7 @@ member_err_0010=Please enter the address member_err_0011=Please enter the correct user name member_err_0012=No inward transfer during hang up period member_err_0013=Parameter cannot be empty Operation_001=Operation succeeded Operation_002=Operation failed src/main/resources/i18n/message_zh_CN.properties
@@ -47,6 +47,7 @@ member_err_0010=\u8BF7\u8F93\u5165\u5730\u5740 member_err_0011=\u8BF7\u8F93\u5165\u6B63\u786E\u7684\u7528\u6237\u540D member_err_0012=\u6302\u673A\u65F6\u95F4\u6BB5\u5185\u7981\u6B62\u5185\u8F6C member_err_0013=\u53C2\u6570\u4E0D\u80FD\u4E3A\u7A7A Operation_001=\u64CD\u4F5C\u6210\u529F Operation_002=\u64CD\u4F5C\u5931\u8D25
