Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

44323

2023-11-28 621d95aeff9feb8f4f1d7e2d33a18e5f2aa753c4

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/OrderUtil.java

@@ -12,7 +12,7 @@
public class OrderUtil {
   
   /* 订单号 */
   private static long orderNum = 0l;
   private static long orderNum = 0L;
   
   /* 日期 */
   private static String date;
@@ -25,7 +25,7 @@
      String str = new SimpleDateFormat("yyMMddHHmmss").format(new Date());
      if (date == null || !date.equals(str)) {
         date = str;
         orderNum = 0l;
         orderNum = 0L;
      }
      orderNum++;
      long orderNo = Long.parseLong((date)) * 1000000;