From e847891c4f6f12cee5e764f8c1fad001496b9740 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 09 Aug 2021 16:30:21 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-core/src/main/java/com/xzx/gc/entity/ScoreDetails.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/gc-core/src/main/java/com/xzx/gc/entity/ScoreDetails.java b/gc-core/src/main/java/com/xzx/gc/entity/ScoreDetails.java
index c074a03..a604357 100644
--- a/gc-core/src/main/java/com/xzx/gc/entity/ScoreDetails.java
+++ b/gc-core/src/main/java/com/xzx/gc/entity/ScoreDetails.java
@@ -16,7 +16,7 @@
//用户ID
private String userId;
- //交易类型 1-用户充值2-集物员支付3-用户兑换所得4-用户消费5-消费退回6-管理员充值7-其他
+ //交易类型 1-用户充值2-集物员支付3-用户兑换所得4-用户消费5-消费退回6-管理员充值7-其他 8-邀请后首单返利 9-分享朋友圈 10-邀请奖励
private Integer type;
public static final Integer SCORE_TYPE_USER_RECHARGE = 1;
public static final Integer SCORE_TYPE_PAY = 2;
@@ -25,6 +25,9 @@
public static final Integer SCORE_TYPE_SHOPPING_RETURN = 5;
public static final Integer SCORE_TYPE_ADMIN_RECHARGE = 6;
public static final Integer SCORE_TYPE_OTHER = 7;
+ public static final Integer SCORE_TYPE_INVITE_FIRST_ORDER = 8;
+ public static final Integer SCORE_TYPE_SHARE_MOMENTS = 9;
+ public static final Integer SCORE_TYPE_INVITE = 10;
//原始积分
private BigDecimal originalScore;
--
Gitblit v1.9.1