From 5c03e2dd5afd65c483ef5da8346e78abc29dc7e3 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 01 四月 2020 14:39:54 +0800
Subject: [PATCH] 新增淘客接口，订单返利比例计算相关service修改
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgMoneyDetail.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgMoneyDetail.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgMoneyDetail.java
index 117c495..dc442ad 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgMoneyDetail.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgMoneyDetail.java
@@ -20,13 +20,13 @@
public class MsgMoneyDetail {
public enum MsgTypeMoneyTypeEnum {
share("鍒嗕韩濂栭噾"),
- invite("閭�璇峰閲�"),
+ invite("鍥㈤槦濂栭噾"),
fanli("杩斿埄鍒拌处"),
extract("鎻愮幇"),
extractAutoWX("鑷姩鎻愮幇"),
extractValid("鎻愮幇璐﹀彿楠岃瘉"),
shareWeiQuan("鍒嗕韩濂栭噾鎵ｉ櫎"),
- inviteWeiQuan("閭�璇峰閲戞墸闄�"),
+ inviteWeiQuan("鍥㈤槦濂栭噾鎵ｉ櫎"),
fanliWeiQuan("杩斿埄鎵ｉ櫎"),
orderReward("杩斿埄濂栧姳"),
systemEqualize("绯荤粺琛ラ綈"),
@@ -37,12 +37,15 @@
redPackGiveBack("绾㈠寘閫�鍥�"),
redPackExchangePass("绾㈠寘鎻愮幇鎴愬姛"),
redPackExchangeReject("绾㈠寘鎻愮幇澶辫触"),
- redPackNewUserReward("鏂颁汉濂栧姳-瀹屾垚棣栫瑪璁㈠崟"),
- redPackInviteSucceed("绔嬪緱鐜伴噾-鎴愬姛閭�璇峰ソ鍙�"),
- redPackFirstSharedOrder("閫掑濂栧姳-濂藉弸瀹屾垚璁㈠崟"),
- redPackMonthSharedOrder("杩炵画濂栧姳-濂藉弸瀹屾垚璁㈠崟"),
+ redPackOneStageReward("绗竴闃舵-绔嬪緱鐜伴噾-鎴愬姛閭�璇峰ソ鍙�"),
+ redPackTwoStageReward("绗簩闃舵-閫掑濂栧姳-濂藉弸瀹屾垚璁㈠崟"),
+ redPackThreeStageReward("绗笁闃舵-杩炵画濂栧姳-濂藉弸瀹屾垚璁㈠崟"),
redPackUseSuccess("绾㈠寘浣跨敤鎴愬姛"),
- redPackUseFail("绾㈠寘浣跨敤澶辫触");
+ redPackUseFail("绾㈠寘浣跨敤澶辫触"),
+ redPackForbid("绾㈠寘灏佺"),
+ redPackForbidRemove("绾㈠寘瑙ｅ皝"),
+ redPackDeduct("绾㈠寘鎵ｉ櫎"),
+ orderTeamReward("鍥㈤槦濂栧姳");
private final String desc;
--
Gitblit v1.8.0