trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiMoneyLogController.java
@@ -75,9 +75,11 @@ log.info(symbols+"=========="); lambdaQueryWrapper.orderByDesc(MoneyLog::getCreateTime); moneyLogService.page(page, lambdaQueryWrapper); List<Item> itemList = itemService.list(); for (MoneyLog log : (List<MoneyLog>) page.getRecords()) { log.setContent_type(log.getContentType()); log.setWallet_type(log.getWalletType()); itemList.stream().filter(x -> x.getSymbol().equals(log.getWalletType())).findFirst().ifPresent(item -> log.setWallet_type(item.getName())); log.setAmount_after(log.getAmountAfter().setScale(4, RoundingMode.HALF_UP)); log.setAmount_before(log.getAmountBefore().setScale(4, RoundingMode.HALF_UP)); if (Constants.MONEYLOG_CONTENT_FINANCE_PROFIT.equals(log.getContentType())) { trading-order-admin/src/main/java/com/yami/trading/api/controller/RealtimeController.java
@@ -29,6 +29,7 @@ import java.math.BigDecimal; import java.math.RoundingMode; import java.text.DecimalFormat; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -82,7 +83,29 @@ d.setSymbolData(bySymbol.getSymbolData()); }); return Result.ok(data); List<Realtime> result = new ArrayList<>(); if (!data.isEmpty()) { Realtime realtime = data.stream().filter(x -> x.getSymbol().equalsIgnoreCase("btcusdt")).findFirst().orElse(null); if (realtime != null) { result.add(realtime); data.remove(realtime); } Realtime realtime2 = data.stream().filter(x -> x.getSymbol().equalsIgnoreCase("ethusdt")).findFirst().orElse(null); if (realtime2 != null) { result.add(realtime2); data.remove(realtime2); } Realtime realtime3 = data.stream().filter(x -> x.getSymbol().equalsIgnoreCase("xrpusdt")).findFirst().orElse(null); if (realtime3 != null) { result.add(realtime3); data.remove(realtime3); } if (!data.isEmpty()) { result.addAll(data); } } return Result.ok(result); } catch (Exception e) { log.error("c", e); throw new YamiShopBindException("生成实时数据失败"); trading-order-bean/src/main/java/com/yami/trading/bean/ico/domain/UserSubscription.java
@@ -29,11 +29,11 @@ private String userId; @ApiModelProperty("申购数量") private Integer subscribeNums; private Long subscribeNums; @ApiModelProperty("中签数量") private Integer ballotNumber; private Long ballotNumber; @ApiModelProperty("状态：1、已认购，2、未中签，3、已中签，4、已缴纳 5.已分发") trading-order-service/src/main/java/com/yami/trading/service/ico/IcoService.java
@@ -186,7 +186,7 @@ } else if (model.getStatus() == 3) { //中签 //已经预支付 if(ico.getIsPayDown() !=null && ico.getIsPayDown() == 1) { int applyNumber = userSubscription.getSubscribeNums() - model.getBallotNumber(); long applyNumber = userSubscription.getSubscribeNums() - model.getBallotNumber(); if(applyNumber > 0) { //退回资金 BigDecimal refundPrice = ico.getUnitAmount().multiply(new BigDecimal(applyNumber)); trading-order-service/src/main/java/com/yami/trading/service/impl/UserSafewordApplyServiceImpl.java
@@ -211,7 +211,7 @@ // 操作类型 operate: 0/修改资金密码；1/取消谷歌绑定；2/取消手机绑定；3/取消邮箱绑定； switch (apply.getOperate()) { case 0: user.setSafePassword(passwordEncoder.encode(apply.getSafeword())); user.setSafePassword(apply.getSafeword()); break; case 1: // if (!user.isGoogleAuthBind()) { trading-order-service/src/main/java/com/yami/trading/service/impl/UserServiceImpl.java
@@ -694,6 +694,10 @@ if (StringUtils.isEmptyString(username) || username.length() > 20) { throw new YamiShopBindException("请输入正确的手机号码"); } User partyPhone = findPartyByVerifiedPhone(username); if (null != partyPhone) { throw new YamiShopBindException("电话号码已绑定其他用户"); } this.savePhone(username, party.getUserId().toString()); } else { // 邮箱注册
