订单状态增加英文

order-application-service/src/main/java/cn/freemud/entities/dto/OrderViewStatusDto.java

@@ -26,6 +26,10 @@ public class OrderViewStatusDto {
      */
     private String orderStatusDesc;
     /**
+     * 订单类型描述
+     */
+    private String orderStatusDescEn;
+    /**
      * 订单类型描述文案
      */
     private String orderStatusDescText;

order-application-service/src/main/java/cn/freemud/entities/vo/QueryOrderResponseVo.java

@@ -147,6 +147,10 @@ public class QueryOrderResponseVo {
      */
     private String orderStatusDesc;
     /**
+     * 订单状态描述
+     */
+    private String orderStatusDescEn;
+    /**
      * 订单状态显示的对应描述
      */
     private String orderStatusDescText;
@@ -196,6 +200,10 @@ public class QueryOrderResponseVo {
      */
     private String payStatusDesc;
     /**
+     * 支付状态描述英文
+     */
+//    private String payStatusDescEn;
+    /**
      * 支付时间
      */
     private String payCreateTime;

order-application-service/src/main/java/cn/freemud/entities/vo/encircle/PreviewOrderInfoVo.java

@@ -65,6 +65,8 @@ public class PreviewOrderInfoVo {
      */
     private String orderStatusDesc;
 
+    private String orderStatusDescEn;
+
     /**
      * 支付状态  enum  PayStatus
      */
@@ -73,6 +75,10 @@ public class PreviewOrderInfoVo {
      * 支付状态描述
      */
     private String payStatusDesc;
+    /**
+     * 支付状态描述英文
+     */
+    private String payStatusDescEn;
 
     /**
      * 订单修改版本号

order-application-service/src/main/java/cn/freemud/enums/OrderStatus.java

@@ -14,21 +14,23 @@ package cn.freemud.enums;
 
 public enum OrderStatus {
 
-    TAKE_ORDER(1, "下单"),
-    WAIT_PAY(2, "待支付"),
-    RECEIPT(3, "接单"),
-    DISTRIBUTION(4, "配送中"),
-    COMPLETE(5, "完成"),
-    CALCEL(6, "取消"),
-    REFUSE(7,"拒单"),
-    COMPLETE_MAKE(31, "制作完成");
+    TAKE_ORDER(1, "下单","take order"),
+    WAIT_PAY(2, "待支付","wait pay"),
+    RECEIPT(3, "接单","receipt order"),
+    DISTRIBUTION(4, "配送中","deliver"),
+    COMPLETE(5, "完成","complete"),
+    CALCEL(6, "取消","cancel"),
+    REFUSE(7,"拒单","refuse order"),
+    COMPLETE_MAKE(31, "制作完成","complete make");
 
     private Integer code;
     private String desc;
+    private String descEn;
 
-    OrderStatus(Integer code, String desc) {
+    OrderStatus(Integer code, String desc,String descEn) {
         this.code = code;
         this.desc = desc;
+        this.descEn = descEn;
     }
 
     public static Integer[] getAllCodes() {
@@ -53,6 +55,14 @@ public enum OrderStatus {
         return null;
     }
 
+    public String getDescEn() {
+        return descEn;
+    }
+
+    public void setDescEn(String descEn) {
+        this.descEn = descEn;
+    }
+
     public Integer getCode() {
         return code;
     }

order-application-service/src/main/java/cn/freemud/enums/PayStatus.java

@@ -14,19 +14,21 @@ package cn.freemud.enums;
 
 public enum PayStatus {
 
-    NOT_PAY(1, "未支付"),
-    HAVE_PAID(2, "已支付"),
-    HAVE_REFUND(3, "已退款"),
-    HAVE_PART_REFUND(4, "已经部分退款"),
-    COMPLETE(5, "完成");
+    NOT_PAY(1, "未支付","not pay"),
+    HAVE_PAID(2, "已支付","have paid"),
+    HAVE_REFUND(3, "已退款","have refund"),
+    HAVE_PART_REFUND(4, "已经部分退款","have part refund"),
+    COMPLETE(5, "完成","complete");
 
 
     private Integer code;
     private String desc;
+    private String descEn;
 
-    PayStatus(Integer code, String desc) {
+    PayStatus(Integer code, String desc,String descEn) {
         this.code = code;
         this.desc = desc;
+        this.descEn = descEn;
     }
 
     public static PayStatus getByCode(Integer code) {
@@ -56,4 +58,12 @@ public enum PayStatus {
     public void setDesc(String desc) {
         this.desc = desc;
     }
+
+    public String getDescEn() {
+        return descEn;
+    }
+
+    public void setDescEn(String descEn) {
+        this.descEn = descEn;
+    }
 }

order-application-service/src/main/java/cn/freemud/enums/RefundStatus.java

@@ -14,19 +14,23 @@ package cn.freemud.enums;
 
 public enum RefundStatus {
 
-    APPLY_REFUND(1, "申请退款"),
-    AGREE_REFUND(2, "同意退款"),
-    ALREADY_REFUND(3, "已退货"),
-    COMPLETE_REFUND(4, "退款完成"),
-    REFUSE_REFUND(5, "拒绝退款");
-
+    APPLY_REFUND(1, "申请退款","apply for a refund"),
+    AGREE_REFUND(2, "同意退款","Agree to refund"),
+    ALREADY_REFUND(3, "已退货","Returned"),
+    COMPLETE_REFUND(4, "退款完成","Refund complete"),
+    REFUSE_REFUND(5, "拒绝退款","Refuse refund");
 
+    /**编号**/
     private Integer code;
+    /**中文**/
     private String desc;
+    /**英文**/
+    private String descEn;
 
-    RefundStatus(Integer code, String desc) {
+    RefundStatus(Integer code, String desc, String descEn) {
         this.code = code;
         this.desc = desc;
+        this.descEn = descEn;
     }
 
     public static RefundStatus getByCode(Integer code) {
@@ -53,4 +57,12 @@ public enum RefundStatus {
     public void setDesc(String desc) {
         this.desc = desc;
     }
+
+    public String getDescEn() {
+        return descEn;
+    }
+
+    public void setDescEn(String descEn) {
+        this.descEn = descEn;
+    }
 }