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 | 8 +++++--- 1 files changed, 5 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 cc1647c..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 @@ -30,6 +30,10 @@ * 分销单状态2已结算 */ public static final Integer STATUS_YJS = 2; + /** + * 分销单状态3已退款 + */ + public static final Integer STATUS_YTK = 3; @Extend @@ -75,10 +79,8 @@ private Double amount; /** - * 结算状态 + * 结算状态 1,待结算,2,已结算,3已退款 */ - - private Integer orderStatus; /** -- Gitblit v1.9.1