From f196447bcf0b1cdb910a47e1babad6f284c28bd2 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 18 十二月 2024 16:58:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/enums/PointChangeType.java |   25 ++++++++++++++-----------
 1 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/enums/PointChangeType.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/enums/PointChangeType.java
index 7b2f61b..5082a61 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/enums/PointChangeType.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/enums/PointChangeType.java
@@ -4,17 +4,20 @@
 
 @Getter
 public enum PointChangeType {
-    CONSUME(1, "消费积分"),
-    COMMISSION_RETURN(2, "返佣积分"),
-    NEW_USER_REFERRAL(3, "拉新人积分"),
-    EXCHANGE_GOODS(4, "兑换商品"),
-    STORE_PERFORMANCE(5, "门店业绩积分"),
-    STORE_COMMISSION_RETURN(6, "门店返佣积分"),
-    TECHNICIAN_PERFORMANCE(7, "技师业绩积分"),
-    TRANSFER_POINTS(8, "转赠积分"),
-    WORK_PERFORMANCE(9, "做工积分"),
-    REGISTRATION(10, "注册积分");
-
+// 1-消费,2-返佣,3-拉新,4-每日分享,5-每日签到,6-使用时长, 7-注册积分, 8-门店业绩,9-门店返佣,10-技师业绩,11-兑换商品,12-他人赠送,13-赠与他人
+    CONSUME(1, "消费"),
+    REBATE(2, "返佣"),
+    PULL_NEW(3, "拉新"),
+    SHARE(4, "每日分享"),
+    SIGN_IN(5, "每日签到"),
+    USE_TIME(6, "使用时长"),
+    REGISTER(7, "注册积分"),
+    SHOP_ACHIEVEMENT(8, "门店业绩"),
+    SHOP_REBATE(9, "门店返佣"),
+    TECHNICIAN_ACHIEVEMENT(10, "技师业绩"),
+    EXCHANGE_GOODS(11, "兑换商品"),
+    OTHER_GIFT(12, "他人赠送"),
+    GIFT(13, "赠与他人");
     private final int code;
     private final String description;
 

--
Gitblit v1.7.1