trading-order-admin/src/main/java/com/yami/trading/admin/task/IcoTask.java
@@ -35,7 +35,7 @@ @Scheduled(cron = "0 */5 * * * ?") public void icoToItem() { QueryWrapper<Ico> query = new QueryWrapper<>(); query.gt("market_date", DateTime.now()); query.lt("market_date", DateTime.now()); List<Ico> icoList = icoService.list(query); if (icoList != null && !icoList.isEmpty()) { List<String> symbolList = icoList.stream().map(Ico::getSymbol).collect(Collectors.toList()); trading-order-bean/src/main/java/com/yami/trading/bean/ico/domain/UserSubscription.java
@@ -56,4 +56,9 @@ @ApiModelProperty("修改时间") private String updatedAt; @TableLogic @TableField(fill = FieldFill.INSERT) private Integer delFlag; } trading-order-bean/src/main/java/com/yami/trading/bean/ico/query/IcoQuery.java
@@ -40,7 +40,8 @@ private String symbolData; @ApiModelProperty("状态:1、已认购,2、未中签,3、已中签,4、已缴纳 5.已分发") @ApiParam("状态:1、已认购,2、未中签,3、已中签,4、已缴纳 5.已分发") @Query(type = QueryType.EQ) private Integer status; @ApiParam(value = "userId") trading-order-service/src/main/java/com/yami/trading/service/ico/IcoService.java
@@ -53,7 +53,6 @@ * 新币申购 */ public Result<String> subscribe(UserSubscription model) { try { if (model == null || model.getIcoProjectId() == null) { throw new YamiShopBindException("参数异常"); } @@ -65,13 +64,10 @@ User party = userService.getById(partyId); if (!party.isEnabled()) { return Result.succeed("User is locked"); throw new YamiShopBindException("User is locked"); } if (Constants.SECURITY_ROLE_TEST.equals(party.getRoleName())) { throw new YamiShopBindException("无权限"); } if (!C2cLock.add(partyId)) { throw new YamiShopBindException("Please try again later"); } if (model.getSubscribeNums() == null || model.getSubscribeNums() == 0) { @@ -122,9 +118,6 @@ } userSubscriptionService.save(model); return Result.ok("申请成功" ); } catch (Exception e) { throw new RuntimeException(e); } } @@ -146,7 +139,7 @@ if(userSubscription.getStatus() == 3){ throw new YamiShopBindException("不能更改申购状态"); } Ico ico = this.getById(model.getIcoProjectId()); Ico ico = this.getById(userSubscription.getIcoProjectId()); String userId = userSubscription.getUserId(); if (model.getStatus() == 3 || model.getStatus() == 5) { if(model.getBallotNumber() == null || model.getBallotNumber() == 0){ @@ -216,7 +209,7 @@ WalletExtend walletExtend = walletService.saveExtendByPara(userId, ico.getSymbol()); walletService.updateExtend(userId, walletExtend.getWallettype(), model.getBallotNumber()); } userSubscriptionService.save(userSubscription); userSubscriptionService.saveOrUpdate(userSubscription); return Result.ok ( "操作成功" ); } catch (Exception e) { throw new RuntimeException(e); @@ -242,7 +235,7 @@ item.setShowStatus("1"); item.setTradeStatus("1"); item.setQuoteCurrency(ico.getCurrency()); item.setCurrencyType(0); item.setCurrencyType(1); //新币 item.setStatus(0); item.setTradeType(ico.getIsContractTrading().toString()); return item; trading-order-service/src/main/resources/mapper/ico/UserSubscriptionMapper.xml
@@ -7,7 +7,6 @@ SELECT u.*,t.name,t.symbol FROM user_subscription_record u LEFT JOIN t_ico_project t ON t.id = u.ico_project_id WHERE u.user_id='1' ${ew.customSqlSegment} </select> trading-order-sys/src/main/resources/mapper/SysMenuMapper.xml
@@ -4,7 +4,9 @@ <mapper namespace="com.yami.trading.sys.dao.SysMenuMapper"> <select id="listMenuIdByRoleId" resultType="Long"> select menu_id from tz_sys_role_menu where role_id = #{roleId} and is_show = 0 select r.menu_id from tz_sys_role_menu r LEFT JOIN tz_sys_menu m ON m.menu_id = r.menu_id where r.role_id = #{roleId} and m.is_show = 0 </select> <!-- 查询用户的所有菜单 -->