From bbe0a2fd03063316e50cf141986bda984599bbda Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Tue, 22 Feb 2022 23:41:42 +0800
Subject: [PATCH] Merge branch 'developer'

---
 zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanOrder.java |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 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 cc1647c..1e19521 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
@@ -30,6 +30,10 @@
 	 * 分销单状态2已结算
 	 */
 	public static final Integer STATUS_YJS = 2;
+	/**
+	 * 分销单状态3已退款
+	 */
+	public static final Integer STATUS_YTK = 3;
 
 
 	@Extend
@@ -51,14 +55,14 @@
 	 */
 
 
-	private String  userId;
+	private Long  userId;
 	
 	/**
 	 * 收益人id
 	 */
 
 
-	private String  salesUserId;
+	private Long  salesUserId;
 	
 	/**
 	 * 收益类型1，推广收益，2邀请收益
@@ -75,10 +79,8 @@
 	private Double  amount;
 	
 	/**
-	 * 结算状态
+	 * 结算状态 1，待结算，2，已结算，3已退款
 	 */
-
-
 	private Integer  orderStatus;
 	
 	/**

--
Gitblit v1.9.1