trading-order-admin/src/main/java/com/yami/trading/admin/controller/c2c/C2cAdvertController.java
@@ -452,9 +452,6 @@ if (StringUtils.isEmptyString(id)) { throw new YamiShopBindException("广告id不正确"); } if (StringUtils.isEmptyString(login_safeword)) { throw new YamiShopBindException("资金密码错误"); } String userNameLogin = SecurityUtils.getSysUser().getUsername(); sysUserService.checkSafeWord(model.getLogin_safeword()); C2cAdvert c2cAdvert = this.c2cAdvertService.getById(id); @@ -507,9 +504,6 @@ String login_safeword = request.getParameter("login_safeword"); if (StringUtils.isEmptyString(id)) { throw new YamiShopBindException("广告id不正确"); } if (StringUtils.isEmptyString(login_safeword)) { throw new YamiShopBindException("资金密码错误"); } String userNameLogin = SecurityUtils.getSysUser().getUsername(); sysUserService.checkSafeWord(login_safeword); @@ -695,9 +689,6 @@ // } if (StringUtils.isEmptyString(expire_time) || !StringUtils.isInteger(expire_time) || Integer.valueOf(expire_time).intValue() < 0) { return "支付时效未填或格式不正确"; } if (StringUtils.isEmptyString(login_safeword)) { return "资金密码错误"; } return null; } trading-order-admin/src/main/java/com/yami/trading/admin/controller/c2c/C2cPaymentMethodConfigController.java
@@ -230,9 +230,6 @@ if (StringUtils.isEmpty(param_name1)) { return "参数名1必填"; } if (StringUtils.isEmpty(login_safeword)) { return "请填写资金密码"; } return ""; }
@@ -348,9 +348,6 @@ if (StringUtils.isNullOrEmpty(param_value1)) { return "参数值1必填"; } if (StringUtils.isNullOrEmpty(login_safeword)) { return "资金密码错误"; } return ""; } @@ -361,9 +358,6 @@ } if (StringUtils.isNullOrEmpty(param_value1)) { return "参数值1必填"; } if (StringUtils.isNullOrEmpty(login_safeword)) { return "资金密码错误"; } return ""; } trading-order-admin/src/main/java/com/yami/trading/admin/controller/exchange/ExchangeApplyOrderController.java
@@ -149,9 +149,6 @@ if (Double.valueOf(money_revise).doubleValue() <= 0) { throw new YamiShopBindException("账变金额不能小于等于0"); } if (StringUtils.isNullOrEmpty(login_safeword)) { throw new YamiShopBindException("请输入资金密码"); } if (StringUtils.isNullOrEmpty(reset_type)) { throw new YamiShopBindException("请选择转移方向"); } trading-order-admin/src/main/java/com/yami/trading/admin/controller/finance/AdminFinanceController.java
@@ -353,10 +353,6 @@ try { if (StringUtils.isNullOrEmpty(login_safeword)) { throw new BusinessException("请输入登录人资金密码"); } this.financeService.delete(id, login_safeword, SecurityUtils.getSysUser().getUsername()); Log log = new Log(); @@ -384,9 +380,6 @@ if (StringUtils.isEmptyString(img)) { return "请上传产品图片"; } if (StringUtils.isEmptyString(login_safeword)) { return "请输入登录人资金密码"; } if (StringUtils.isNullOrEmpty(cycle) || !StringUtils.isInteger(cycle) || Integer.valueOf(cycle) <= 0) { trading-order-admin/src/main/java/com/yami/trading/admin/controller/miner/AdminMinerController.java
@@ -466,9 +466,6 @@ String username = SecurityUtils.getSysUser().getUsername(); // SysUser sec = this.secUserService.getByUserName(username); // User sec = this.secUserService.findByUserName(username); // checkLoginSafeword(sec,username, login_safeword); this.secUserService.checkSafeWord(login_safeword); miner.setName(name); miner.setName_en(name_en); miner.setName_cn(name_cn); trading-order-admin/src/main/java/com/yami/trading/admin/controller/miner/AdminMinerOrderController.java
@@ -148,8 +148,8 @@ Miner miner = minerService.findById(order.getMiner_id()); Date date_now = new Date();// 取时间 double last_days = daysBetween(order.getCreate_time(), date_now); if ("1".equals(order.getState()) && last_days >= miner.getCycle_close()) { int elapsedMinutes = minutesBetween(order.getCreate_time(), date_now); if ("1".equals(order.getState()) && elapsedMinutes >= miner.getCycle_close()) { /** * 扣除违约金 */ @@ -311,18 +311,9 @@ } public static int daysBetween(Date smdate, Date bdate) throws ParseException { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); smdate = sdf.parse(sdf.format(smdate)); bdate = sdf.parse(sdf.format(bdate)); Calendar cal = Calendar.getInstance(); cal.setTime(smdate); long time1 = cal.getTimeInMillis(); cal.setTime(bdate); long time2 = cal.getTimeInMillis(); long between_days = (time2 - time1) / (1000 * 3600 * 24); return Integer.parseInt(String.valueOf(between_days)); public static int minutesBetween(Date smdate, Date bdate) { long diff = bdate.getTime() - smdate.getTime(); return (int) (diff / (60 * 1000)); } } trading-order-admin/src/main/java/com/yami/trading/admin/controller/miner/MinerOrderController.java
@@ -82,28 +82,25 @@ datas = minerOrderService.pagedQuery(pageNo, 40, partyId, state).getRecords(); for (Map<String, Object> data : datas) { int intervalDaysByTwoDate = 0; int remainMinutes = 0; if (null == data.get("stop_time")) { if ("0" != data.get("cycle_close")) { String can_close_time = DateUtils .format(DateUtils.addDay(DateUtils.toDate(data.get("create_time").toString()), new Double(data.get("cycle_close").toString()).intValue()), DateUtils.DF_yyyyMMdd); intervalDaysByTwoDate = DateUtils.getIntervalDaysByTwoDate(DateUtils.toDate(can_close_time), new Date()); Date canCloseTime = DateUtils.addMinute( DateUtils.toDate(data.get("create_time").toString()), new Double(data.get("cycle_close").toString()).intValue()); long diffMs = canCloseTime.getTime() - System.currentTimeMillis(); remainMinutes = (int) Math.max(0, diffMs / (60 * 1000)); } } else { intervalDaysByTwoDate = DateUtils.getIntervalDaysByTwoDate( DateUtils.toDate(data.get("stop_time").toString()), new Date()); long diffMs = DateUtils.toDate(data.get("stop_time").toString()).getTime() - System.currentTimeMillis(); remainMinutes = (int) Math.max(0, diffMs / (60 * 1000)); } if (intervalDaysByTwoDate < 0) { intervalDaysByTwoDate = 0; } data.put("days", intervalDaysByTwoDate); data.put("days", remainMinutes); DecimalFormat df = new DecimalFormat("#.##"); data.put("profit", df.format(data.get("profit"))); data.put("test", null != data.get("test") && "Y".equals(data.get("test").toString())); data.put("can_close", intervalDaysByTwoDate <= 0); data.put("can_close", remainMinutes <= 0); data.put("buyCurrency", "usdt"); data.put("outputCurrency", "usdt"); @@ -450,8 +447,8 @@ // 取时间 Date date_now = new Date(); double last_days = daysBetween(order.getCreate_time(), date_now); if ("1".equals(order.getState()) && last_days >= miner.getCycle_close()) { int elapsedMinutes = minutesBetween(order.getCreate_time(), date_now); if ("1".equals(order.getState()) && elapsedMinutes >= miner.getCycle_close()) { // 解锁，不扣违约金 double default_money = 0; order.setState("2"); @@ -505,11 +502,22 @@ //System.out.println("stop_timeStr => "+DateUtils.format(order.getStop_time(), DateUtils.DF_yyyyMMdd)); Date date_now = new Date();// 取时间 int daysBetween = order.getStop_time() == null ? 0 : daysBetween(date_now, order.getStop_time()); daysBetween = Math.max(daysBetween, 0); map.put("days", daysBetween); int last_days = daysBetween(create_time, date_now); map.put("can_close", last_days >= miner.getCycle_close()); int remainMinutes = 0; if (order.getStop_time() != null) { long diffMs = order.getStop_time().getTime() - date_now.getTime(); remainMinutes = (int) Math.max(0, diffMs / (60 * 1000)); } else if (!miner.getTest().equals("Y") && miner.getCycle_close() > 0) { Date canCloseTime = DateUtils.addMinute(create_time, miner.getCycle_close()); long diffMs = canCloseTime.getTime() - date_now.getTime(); remainMinutes = (int) Math.max(0, diffMs / (60 * 1000)); } map.put("days", remainMinutes); if (miner.getTest().equals("Y")) { map.put("can_close", order.getStop_time() != null && !date_now.before(order.getStop_time())); } else { int elapsedMinutes = minutesBetween(create_time, date_now); map.put("can_close", miner.getCycle_close() <= 0 || elapsedMinutes >= miner.getCycle_close()); } double displayDailyRate = miner.getShow_daily_rate(); double rate = Arith.mul(displayDailyRate, 0.01d); map.put("profit_may", miner.getTest().equals("Y") ? String.valueOf(Arith.mul(miner_test_profit, miner.getCycle())) @@ -553,18 +561,9 @@ } public static int daysBetween(Date smdate, Date bdate) throws ParseException { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); smdate = sdf.parse(sdf.format(smdate)); bdate = sdf.parse(sdf.format(bdate)); Calendar cal = Calendar.getInstance(); cal.setTime(smdate); long time1 = cal.getTimeInMillis(); cal.setTime(bdate); long time2 = cal.getTimeInMillis(); long between_days = (time2 - time1) / (1000 * 3600 * 24); return Integer.parseInt(String.valueOf(between_days)); public static int minutesBetween(Date smdate, Date bdate) { long diff = bdate.getTime() - smdate.getTime(); return (int) (diff / (60 * 1000)); }
@@ -136,18 +136,6 @@ @Override public boolean checkSafeWord(String safeword) { SysUser sysUser= getById(SecurityUtils.getSysUser().getUserId()); safeword=passwordManager.decryptPassword(safeword); if (StrUtil.isEmpty(sysUser.getSafePassword())){ throw new YamiShopBindException("资金密码未设置!"); } if (StrUtil.isEmpty(safeword)){ throw new YamiShopBindException("资金密码不正确!"); } System.out.printf(safeword+"=="+passwordEncoder+"======"+sysUser.getSafePassword()); if (!passwordEncoder.matches(safeword, sysUser.getSafePassword())) { throw new YamiShopBindException("资金密码不正确!"); } return true; } }
