From 51b1242dc2f55276b65f287974e7f86dcab8c74d Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 16 Mar 2021 21:56:27 +0800
Subject: [PATCH] 修改商品查询bug1
---
zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanOrder.java | 35 ++++++++++++++++++++++++++++-------
1 files changed, 28 insertions(+), 7 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 ab03488..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
@@ -7,12 +7,35 @@
/**
* @description 分销订单
- * @author jyy
- * @date 2021-03-10 15:22
+ * @author yourName
+ * @date 2021-03-10 17:34
*/
@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;
@@ -32,14 +55,14 @@
*/
- private Long userId;
+ private String userId;
/**
* 收益人id
*/
- private Long salesUserId;
+ private String salesUserId;
/**
* 收益类型1，推广收益，2邀请收益
@@ -56,10 +79,8 @@
private Double amount;
/**
- * 结算状态
+ * 结算状态 1，待结算，2，已结算，3已退款
*/
-
-
private Integer orderStatus;
/**
--
Gitblit v1.9.1