新增订单状态获取

yshop-common/src/main/java/co/yixiang/enums/OrderLogEnum.java

@@ -3,6 +3,8 @@ package co.yixiang.enums;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
+import java.util.stream.Stream;
+
 /**
  * @author hupeng
  * 订单操作相关枚举
@@ -23,6 +25,7 @@ public enum OrderLogEnum {
 	CREATE_ORDER_SUCCESS("SUCCESS","订单创建成功"),
 	CREATE_ORDER("yshop_create_order","订单生成"),
 	NONE_ORDER("NONE","订单OK"),
+	DELIVERY_GOODS("delivery_goods", "订单发货"),
 	EXTEND_ORDER("EXTEND_ORDER","订单已生成");
 
 
@@ -31,5 +34,15 @@ public enum OrderLogEnum {
 
 
 
+	public static OrderLogEnum toType(String value) {
+		return Stream.of(OrderLogEnum.values())
+				.filter(p -> p.value.equals(value))
+				.findAny()
+				.orElse(null);
+	}
+
+	public static String getDesc(String value) {
+		return toType(value) == null ? null : toType(value).desc;
+	}
 
 }

yshop-common/src/main/java/co/yixiang/utils/DateUtils.java

@@ -10,6 +10,7 @@ import org.apache.commons.lang3.time.DateFormatUtils;
 import java.lang.management.ManagementFactory;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.Calendar;
 import java.util.Date;
 
 /**
@@ -135,4 +136,19 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
         // long sec = diff % nd % nh % nm / ns;
         return day + "天" + hour + "小时" + min + "分钟";
     }
+
+    /**
+     * 秒转换为指定格式的日期
+     *
+     * @param second
+     * @return
+     */
+    public static String secondToDate(long second) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTimeInMillis(second * 1000);//转换为毫秒
+        Date date = calendar.getTime();
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+        String dateString = format.format(date);
+        return dateString;
+    }
 }