From 53939e0ceb528f45c4906c86ce499ecb864f7af8 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Mon, 15 Mar 2021 14:38:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanOrder.java | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanOrder.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanOrder.java
index 5f16ee6..761dd2a 100644
--- a/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanOrder.java
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanOrder.java
@@ -13,6 +13,29 @@
@Data
@TableName("shop_salesman_order")
public class ShopSalesmanOrder extends BaseEntity {
+ /**
+ * 推广收益类型1推广收益
+ */
+ public static final Integer REVENUE_TYPE_SALES = 1;
+
+ /**
+ * 推广收益类型2邀请收益
+ */
+ public static final Integer REVENUE_TYPE_INVITATION = 2;
+ /**
+ * 分销单状态1待结算
+ */
+ public static final Integer STATUS_DJS = 1;
+ /**
+ * 分销单状态2已结算
+ */
+ public static final Integer STATUS_YJS = 2;
+ /**
+ * 分销单状态3已退款
+ */
+ public static final Integer STATUS_YTK = 3;
+
+
@Extend
private static final long serialVersionUID = 1L;
@@ -56,10 +79,8 @@
private Double amount;
/**
- * 结算状态
+ * 结算状态 1，待结算，2，已结算，3已退款
*/
-
-
private Integer orderStatus;
/**
--
Gitblit v1.9.1