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/ScoreVipDetail.java | 48 ++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 44 insertions(+), 4 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreVipDetail.java b/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreVipDetail.java index aa2f2c8..b32fe45 100644 --- a/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreVipDetail.java +++ b/zq-erp/src/main/java/com/matrix/system/score/entity/ScoreVipDetail.java @@ -9,17 +9,57 @@ /** * @description 客户积分余额 - * @author yourName + * @author jyy * @date 2021-02-26 15:26 */ @Data @TableName("score_vip_detail") public class ScoreVipDetail extends BaseEntity{ @Extend - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; - + /** + * 获取类型(1:现金消费) + */ + public static final int SCORE_VIP_TYPE_CASH=1; + + /** + * 获取类型(2:赠送等) + */ + public static final int SCORE_VIP_TYPE_CONSUME=2; + /** + * 获取类型(3推荐客户) + */ + public static final int SCORE_VIP_TYPE_REFERRER=3; + /** + * 获取类型(4参加活动) + */ + public static final int SCORE_VIP_TYPE_JOIN_ACTIVE=4; + + + /** + * 获取类型(4人工调整) + */ + public static final int SCORE_VIP_TYPE_USERCHANGE=4; + /** + * 获取类型(5积分失效) + */ + public static final int SCORE_OVER_TIME=5; + + /** 有效*/ + public static final int SCORE_STATUS_YX=1; + /** 无效*/ + public static final int SCORE_STATUS_WX=2; + + + + + + /** + * erp用户Id + */ + private Long vipId; /** @@ -76,7 +116,7 @@ */ - private String businessId; + private Long businessId; /** * 所属公司_id -- Gitblit v1.9.1