From ad31648c6f7a8bff1f7ccdf84b76006b9ffb78f8 Mon Sep 17 00:00:00 2001 From: jyy <jyy> Date: Sat, 17 Jul 2021 15:59:10 +0800 Subject: [PATCH] 1. 新增套餐中有效和无效的操作 2. 会员修改门店功能 3. 套餐新增编辑次数功能 4. 计算是否为赠送的条件为,全部为赠送金额购买且支付金额大于0 5. 打印小票功能调整间距,和收银人 6. PC端服务单新增划扣金额展示 --- zq-erp/src/main/java/com/matrix/system/score/entity/ScoreUseRecord.java | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreUseRecord.java b/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreUseRecord.java index a95ffec..075e21c 100644 --- a/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreUseRecord.java +++ b/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreUseRecord.java @@ -14,9 +14,9 @@ @TableName("score_use_record") public class ScoreUseRecord extends BaseEntity{ @Extend - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; - + @@ -25,7 +25,7 @@ */ - private Integer recType; + private Integer type; /** * 数量 @@ -40,7 +40,10 @@ private Long businessId; - + /** + * 操作人id + */ + Long oprationUserId; /** * 积分卡ID */ @@ -65,10 +68,10 @@ /** * 操作人ID */ + private Long vipId; + private Long shopId; - private Long userId; - /** * 备注 */ -- Gitblit v1.9.1