From e6d19def344a8875a2ec850068df41647649b20a Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Wed, 14 Apr 2021 16:30:12 +0800 Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop --- zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalemanSettlement.java | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalemanSettlement.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalemanSettlement.java index 3a653ca..66a9dc1 100644 --- a/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalemanSettlement.java +++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalemanSettlement.java @@ -7,17 +7,28 @@ /** * @description 订单结算记录 - * @author jyy - * @date 2021-03-10 15:22 + * @author yourName + * @date 2021-03-10 17:34 */ @Data @TableName("shop_saleman_settlement") public class ShopSalemanSettlement extends BaseEntity { @Extend private static final long serialVersionUID = 1L; - + /** + * 结算编号头部编码 + */ + public static final String ORDERNO_START = "J"; + /** + * 结算方式 1 线下结算 + */ + public static final Integer SETTLEMENTWAY_XXJS = 1; + /** + * 结算方式 2 微信余额结算 + */ + public static final Integer SETTLEMENTWAY_YEJS = 2; /** -- Gitblit v1.9.1