更新sql和代码规范修改
This commit is contained in:
@ -41,6 +41,7 @@ public class IntegralRuleDTO {
|
||||
* 是否开启
|
||||
*/
|
||||
private Boolean enable;
|
||||
|
||||
public IntegralRuleDTO() {
|
||||
}
|
||||
}
|
||||
|
@ -21,7 +21,7 @@ public class MemberUserRespDTO {
|
||||
private String nickname;
|
||||
/**
|
||||
* 帐号状态
|
||||
*
|
||||
* <p>
|
||||
* 枚举 {@link CommonStatusEnum}
|
||||
*/
|
||||
private Integer status;
|
||||
|
@ -1,7 +1,6 @@
|
||||
/**
|
||||
* Copyright (C) 2018-2022
|
||||
* All rights reserved, Designed By www.yixiang.co
|
||||
|
||||
*/
|
||||
package co.yixiang.yshop.module.member.enums;
|
||||
|
||||
@ -16,36 +15,36 @@ import lombok.Getter;
|
||||
@AllArgsConstructor
|
||||
public enum BillDetailEnum {
|
||||
|
||||
TYPE_1("recharge","充值"),
|
||||
TYPE_2("brokerage","返佣"),
|
||||
TYPE_3("pay_product","消费"),
|
||||
TYPE_4("extract","提现"),
|
||||
TYPE_5("pay_product_refund","退款"),
|
||||
TYPE_6("system_add","系统添加"),
|
||||
TYPE_7("system_sub","系统减少"),
|
||||
TYPE_8("deduction","减去"),
|
||||
TYPE_1("recharge", "充值"),
|
||||
TYPE_2("brokerage", "返佣"),
|
||||
TYPE_3("pay_product", "消费"),
|
||||
TYPE_4("extract", "提现"),
|
||||
TYPE_5("pay_product_refund", "退款"),
|
||||
TYPE_6("system_add", "系统添加"),
|
||||
TYPE_7("system_sub", "系统减少"),
|
||||
TYPE_8("deduction", "减去"),
|
||||
|
||||
TYPE_9("gain","购买商品奖励"),
|
||||
TYPE_10("sign","签到"),
|
||||
TYPE_11("upgrade","升级"),
|
||||
TYPE_12("deduction","消费抵扣"),
|
||||
TYPE_13("canal_order","取消订单"),
|
||||
SIGN("sign", "签到"),
|
||||
REGISTER("register", "注册"),
|
||||
LOGIN("login", "登录"),
|
||||
CONSUME("consume", "消费奖励"),
|
||||
COMMENT("comment", "评论"),
|
||||
SHARE_PRODUCTS("share_products", "分享商品"),
|
||||
TYPE_9("gain", "购买商品奖励"),
|
||||
TYPE_10("sign", "签到"),
|
||||
TYPE_11("upgrade", "升级"),
|
||||
TYPE_12("deduction", "消费抵扣"),
|
||||
TYPE_13("canal_order", "取消订单"),
|
||||
SIGN("sign", "签到"),
|
||||
REGISTER("register", "注册"),
|
||||
LOGIN("login", "登录"),
|
||||
CONSUME("consume", "消费奖励"),
|
||||
COMMENT("comment", "评论"),
|
||||
SHARE_PRODUCTS("share_products", "分享商品"),
|
||||
|
||||
|
||||
CATEGORY_1("now_money","金额"),
|
||||
CATEGORY_2("integral","积分"),
|
||||
CATEGORY_3("pay","支付"),;
|
||||
CATEGORY_1("now_money", "金额"),
|
||||
CATEGORY_2("integral", "积分"),
|
||||
CATEGORY_3("pay", "支付"),
|
||||
;
|
||||
|
||||
|
||||
|
||||
private String value;
|
||||
private String desc;
|
||||
private String value;
|
||||
private String desc;
|
||||
|
||||
|
||||
}
|
||||
|
@ -1,7 +1,6 @@
|
||||
/**
|
||||
* Copyright (C) 2018-2022
|
||||
* All rights reserved, Designed By www.yixiang.co
|
||||
|
||||
*/
|
||||
package co.yixiang.yshop.module.member.enums;
|
||||
|
||||
@ -18,27 +17,23 @@ import java.util.stream.Stream;
|
||||
@AllArgsConstructor
|
||||
public enum BillEnum {
|
||||
|
||||
PM_0(0,"支出"),
|
||||
PM_1(1,"获得"),
|
||||
PM_0(0, "支出"),
|
||||
PM_1(1, "获得"),
|
||||
|
||||
STATUS_0(0,"默认"),
|
||||
STATUS_1(1,"有效"),
|
||||
STATUS_2(2,"无效");
|
||||
STATUS_0(0, "默认"),
|
||||
STATUS_1(1, "有效"),
|
||||
STATUS_2(2, "无效");
|
||||
|
||||
|
||||
private Integer value;
|
||||
private String desc;
|
||||
|
||||
|
||||
|
||||
private Integer value;
|
||||
private String desc;
|
||||
|
||||
public static BillEnum toType(int value) {
|
||||
return Stream.of(BillEnum.values())
|
||||
.filter(p -> p.value == value)
|
||||
.findAny()
|
||||
.orElse(null);
|
||||
}
|
||||
|
||||
public static BillEnum toType(int value) {
|
||||
return Stream.of(BillEnum.values())
|
||||
.filter(p -> p.value == value)
|
||||
.findAny()
|
||||
.orElse(null);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
@ -4,7 +4,7 @@ import co.yixiang.yshop.framework.common.exception.ErrorCode;
|
||||
|
||||
/**
|
||||
* Member 错误码枚举类
|
||||
*
|
||||
* <p>
|
||||
* member 系统,使用 1-004-000-000 段
|
||||
*/
|
||||
public interface ErrorCodeConstants {
|
||||
|
@ -8,10 +8,10 @@ import lombok.Getter;
|
||||
**/
|
||||
@Getter
|
||||
public enum LevelEquityEnum {
|
||||
FREE_SHIPPING("free_shipping","全场包邮"),
|
||||
DISCOUNT("discount","会员折扣"),
|
||||
INTEGRAL("integral","会员积分"),
|
||||
COUPON("coupon","会员专享券"),
|
||||
FREE_SHIPPING("free_shipping", "全场包邮"),
|
||||
DISCOUNT("discount", "会员折扣"),
|
||||
INTEGRAL("integral", "会员积分"),
|
||||
COUPON("coupon", "会员专享券"),
|
||||
;
|
||||
private final String type;
|
||||
private final String name;
|
||||
|
@ -14,7 +14,7 @@ public enum LevelGrowthValueEnum {
|
||||
private final String type;
|
||||
private final String name;
|
||||
|
||||
LevelGrowthValueEnum(String type, String name) {
|
||||
LevelGrowthValueEnum(String type, String name) {
|
||||
this.type = type;
|
||||
this.name = name;
|
||||
}
|
||||
|
@ -1,7 +1,6 @@
|
||||
/**
|
||||
* Copyright (C) 2018-2022
|
||||
* All rights reserved, Designed By www.yixiang.co
|
||||
|
||||
*/
|
||||
package co.yixiang.yshop.module.member.enums;
|
||||
|
||||
@ -17,18 +16,16 @@ import lombok.Getter;
|
||||
public enum LoginTypeEnum {
|
||||
|
||||
|
||||
WXAPP("wxapp","微信小程序"),
|
||||
ALIAPP("aliapp","支付宝小程序"),
|
||||
WECHAT("wechat","微信公众号"),
|
||||
H5("h5","h5"),
|
||||
PC("pc","pc"),
|
||||
APP("app","APP");
|
||||
WXAPP("wxapp", "微信小程序"),
|
||||
ALIAPP("aliapp", "支付宝小程序"),
|
||||
WECHAT("wechat", "微信公众号"),
|
||||
H5("h5", "h5"),
|
||||
PC("pc", "pc"),
|
||||
APP("app", "APP");
|
||||
|
||||
|
||||
|
||||
|
||||
private String value;
|
||||
private String desc;
|
||||
private String value;
|
||||
private String desc;
|
||||
|
||||
|
||||
}
|
||||
|
Reference in New Issue
Block a user