diff --git a/framework/src/main/java/cn/lili/modules/member/entity/aop/interceptor/PointLogInterceptor.java b/framework/src/main/java/cn/lili/modules/member/entity/aop/interceptor/PointLogInterceptor.java index 425fcb72..9ffd7201 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/aop/interceptor/PointLogInterceptor.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/aop/interceptor/PointLogInterceptor.java @@ -3,6 +3,7 @@ package cn.lili.modules.member.entity.aop.interceptor; import cn.lili.common.utils.CurrencyUtil; import cn.lili.modules.member.entity.dos.Member; import cn.lili.modules.member.entity.dos.MemberPointsHistory; +import cn.lili.modules.member.entity.enums.PointTypeEnum; import cn.lili.modules.member.service.MemberPointsHistoryService; import cn.lili.modules.member.service.MemberService; import lombok.extern.slf4j.Slf4j; @@ -55,7 +56,7 @@ public class PointLogInterceptor { MemberPointsHistory memberPointsHistory = new MemberPointsHistory(); memberPointsHistory.setMemberId(member.getId()); memberPointsHistory.setMemberName(member.getUsername()); - memberPointsHistory.setPointType(type ? 1 : 0); + memberPointsHistory.setPointType(type ? PointTypeEnum.INCREASE.name() : PointTypeEnum.REDUCE.name()); memberPointsHistory.setVariablePoint(point); memberPointsHistory.setBeforePoint(new Double(CurrencyUtil.sub(member.getPoint(), point)).longValue()); memberPointsHistory.setPoint(member.getPoint()); diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberPointsHistory.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberPointsHistory.java index 7b11e00b..8da788be 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberPointsHistory.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberPointsHistory.java @@ -73,9 +73,10 @@ public class MemberPointsHistory { @ApiModelProperty(value = "content") private String content; - @Min(message = "最小值为0", value = 0) - @Max(message = "最大值为1", value = 1) - @ApiModelProperty(value = "消费积分类型,1为增加,0为消费") - private Integer pointType; + /** + * @see cn.lili.modules.member.entity.enums.PointTypeEnum + */ + @ApiModelProperty(value = "消费积分类型") + private String pointType; } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/member/entity/enums/PointTypeEnum.java b/framework/src/main/java/cn/lili/modules/member/entity/enums/PointTypeEnum.java new file mode 100644 index 00000000..3f965ae5 --- /dev/null +++ b/framework/src/main/java/cn/lili/modules/member/entity/enums/PointTypeEnum.java @@ -0,0 +1,29 @@ +package cn.lili.modules.member.entity.enums; + +/** + * 积分类型枚举 + * + * @author Chopper + * @date 2021/3/20 10:44 + */ + +public enum PointTypeEnum { + /** + * 增加 + */ + INCREASE("增加"), + /** + * 减少 + */ + REDUCE("减少"); + + private String description; + + public String description() { + return description; + } + + PointTypeEnum(String description) { + this.description = description; + } +} diff --git a/update-sql/version4.1to4.2.sql b/update-sql/version4.1to4.2.sql index c801755e..ee0c7839 100644 --- a/update-sql/version4.1to4.2.sql +++ b/update-sql/version4.1to4.2.sql @@ -9,4 +9,8 @@ ALTER TABLE li_article_category alter column sort set default 0; INSERT INTO `lilishop`.`li_menu`(`id`, `create_by`, `create_time`, `delete_flag`, `update_by`, `update_time`, `description`, `front_route`, `icon`, `level`, `name`, `parent_id`, `path`, `sort_order`, `title`, `front_component`) VALUES (1410862675914764290, 'admin', '2021-07-02 15:27:29', b'0', 'admin', '2021-07-02 15:27:45', 'null', 'distribution/distributionCash', '', 2, 'distributionCash', '1374173575405109248', 'distributionCash', 5.00, '分销提现', 'null'); /** 促销商品添加商品类型**/ -ALTER TABLE li_promotion_goods ADD goods_type varchar (200); \ No newline at end of file +ALTER TABLE li_promotion_goods ADD goods_type varchar (200); +/** 修改历史积分积分类型的字段类型 **/ +alter table li_member_points_history modify column point_type varchar(50); +update li_member_points_history set point_type = 'INCREASE' where point_type=1; +update li_member_points_history set point_type = 'REDUCE' where point_type=0; \ No newline at end of file