From 92a4c3c35747bf1a043c2ff85650012d4eac9355 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期二, 10 九月 2024 10:48:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/mzl/flower/constant/Constants.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/mzl/flower/constant/Constants.java b/src/main/java/com/mzl/flower/constant/Constants.java
index 7834f25..15f6667 100644
--- a/src/main/java/com/mzl/flower/constant/Constants.java
+++ b/src/main/java/com/mzl/flower/constant/Constants.java
@@ -296,7 +296,9 @@
public enum SETTLEMENT_STATUS {
PENDING("待结算"),
- COMPLETED("已结算"),
+ PROCESSING("结算中"),
+ COMPLETED("结算成功"),
+ FAILED("结算失败"),
;
SETTLEMENT_STATUS(String desc) {
@@ -428,4 +430,20 @@
}
}
+ public enum after_sale_type {
+ barters("换货"),
+ returns("退货"),
+ ;
+
+ after_sale_type(String desc) {
+ this.desc = desc;
+ }
+
+ private String desc;
+
+ public String getDesc() {
+ return desc;
+ }
+ }
+
}
--
Gitblit v1.9.3