1

zj

6 days ago bf362d7ee6ab091cd26d69be9095440e5000928c

 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));
   }

}