更新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;
|
||||
|
||||
|
||||
}
|
||||
|
@ -2,7 +2,9 @@ package co.yixiang.yshop.module.member.controller.admin.burypoint;
|
||||
|
||||
import co.yixiang.yshop.module.member.dal.dataobject.burypoint.TrendChartRespVO;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
@ -16,11 +18,13 @@ import java.io.IOException;
|
||||
|
||||
import co.yixiang.yshop.framework.common.pojo.PageResult;
|
||||
import co.yixiang.yshop.framework.common.pojo.CommonResult;
|
||||
|
||||
import static co.yixiang.yshop.framework.common.pojo.CommonResult.success;
|
||||
|
||||
import co.yixiang.yshop.framework.excel.core.util.ExcelUtils;
|
||||
|
||||
import co.yixiang.yshop.framework.operatelog.core.annotations.OperateLog;
|
||||
|
||||
import static co.yixiang.yshop.framework.operatelog.core.enums.OperateTypeEnum.*;
|
||||
|
||||
import co.yixiang.yshop.module.member.controller.admin.burypoint.vo.*;
|
||||
@ -92,7 +96,7 @@ public class BuryPointController {
|
||||
@PreAuthorize("@ss.hasPermission('member:bury-point:export')")
|
||||
@OperateLog(type = EXPORT)
|
||||
public void exportBuryPointExcel(@Valid BuryPointExportReqVO exportReqVO,
|
||||
HttpServletResponse response) throws IOException {
|
||||
HttpServletResponse response) throws IOException {
|
||||
List<BuryPointDO> list = buryPointService.getBuryPointList(exportReqVO);
|
||||
// 导出 Excel
|
||||
List<BuryPointExcelVO> datas = BuryPointConvert.INSTANCE.convertList02(list);
|
||||
|
@ -2,15 +2,16 @@ package co.yixiang.yshop.module.member.controller.admin.burypoint.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.LocalDateTime;
|
||||
import javax.validation.constraints.*;
|
||||
|
||||
/**
|
||||
* 埋点 Base VO,提供给添加、修改、详细的子 VO 使用
|
||||
* 如果子 VO 存在差异的字段,请不要添加到这里,影响 Swagger 文档生成
|
||||
*/
|
||||
* 埋点 Base VO,提供给添加、修改、详细的子 VO 使用
|
||||
* 如果子 VO 存在差异的字段,请不要添加到这里,影响 Swagger 文档生成
|
||||
*/
|
||||
@Data
|
||||
public class BuryPointBaseVO {
|
||||
|
||||
|
@ -1,8 +1,11 @@
|
||||
package co.yixiang.yshop.module.member.controller.admin.burypoint.vo;
|
||||
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
import javax.validation.constraints.*;
|
||||
|
||||
@Schema(description = "管理后台 - 埋点创建 Request VO")
|
||||
|
@ -2,6 +2,7 @@ package co.yixiang.yshop.module.member.controller.admin.burypoint.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.LocalDateTime;
|
||||
|
@ -1,10 +1,14 @@
|
||||
package co.yixiang.yshop.module.member.controller.admin.burypoint.vo;
|
||||
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import co.yixiang.yshop.framework.common.pojo.PageParam;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import static co.yixiang.yshop.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
|
||||
|
@ -1,10 +1,13 @@
|
||||
package co.yixiang.yshop.module.member.controller.admin.burypoint.vo;
|
||||
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import co.yixiang.yshop.framework.common.pojo.PageParam;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import static co.yixiang.yshop.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
|
||||
|
@ -2,6 +2,7 @@ package co.yixiang.yshop.module.member.controller.admin.burypoint.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Schema(description = "管理后台 - 埋点 Response VO")
|
||||
|
@ -2,6 +2,7 @@ package co.yixiang.yshop.module.member.controller.admin.burypoint.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
import javax.validation.constraints.*;
|
||||
|
||||
|
@ -89,7 +89,7 @@ public class IntegralRuleController {
|
||||
@PreAuthorize("@ss.hasPermission('member:integral-rule:export')")
|
||||
@OperateLog(type = EXPORT)
|
||||
public void exportIntegralRuleExcel(@Valid IntegralRuleExportReqVO exportReqVO,
|
||||
HttpServletResponse response) throws IOException {
|
||||
HttpServletResponse response) throws IOException {
|
||||
List<IntegralRuleDO> list = integralRuleService.getIntegralRuleList(exportReqVO);
|
||||
// 导出 Excel
|
||||
List<IntegralRuleExcelVO> datas = IntegralRuleConvert.INSTANCE.convertList02(list);
|
||||
@ -99,7 +99,7 @@ public class IntegralRuleController {
|
||||
@GetMapping("getRule")
|
||||
@Operation(summary = "查询会员积分规则")
|
||||
@PreAuthorize("@ss.hasPermission('member:integral-rule:query')")
|
||||
public CommonResult<IntegralRuleVO> getRule(){
|
||||
public CommonResult<IntegralRuleVO> getRule() {
|
||||
IntegralRuleVO vo = integralRuleService.getRule();
|
||||
return CommonResult.success(vo);
|
||||
}
|
||||
@ -107,7 +107,7 @@ public class IntegralRuleController {
|
||||
@PostMapping("saveRule")
|
||||
@Operation(summary = "保存会员积分规则")
|
||||
@PreAuthorize("@ss.hasPermission('member:integral-rule:update')")
|
||||
public CommonResult<Boolean> saveRule(@RequestBody IntegralRuleVO vo){
|
||||
public CommonResult<Boolean> saveRule(@RequestBody IntegralRuleVO vo) {
|
||||
integralRuleService.saveRule(vo);
|
||||
return CommonResult.success(true);
|
||||
}
|
||||
|
@ -6,9 +6,9 @@ import lombok.Data;
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
||||
/**
|
||||
* 会员积分规则 Base VO,提供给添加、修改、详细的子 VO 使用
|
||||
* 如果子 VO 存在差异的字段,请不要添加到这里,影响 Swagger 文档生成
|
||||
*/
|
||||
* 会员积分规则 Base VO,提供给添加、修改、详细的子 VO 使用
|
||||
* 如果子 VO 存在差异的字段,请不要添加到这里,影响 Swagger 文档生成
|
||||
*/
|
||||
@Data
|
||||
public class IntegralRuleBaseVO {
|
||||
|
||||
|
@ -1,8 +1,11 @@
|
||||
package co.yixiang.yshop.module.member.controller.admin.integralrule.vo;
|
||||
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
import javax.validation.constraints.*;
|
||||
|
||||
@Schema(description = "管理后台 - 会员积分规则创建 Request VO")
|
||||
|
@ -1,10 +1,14 @@
|
||||
package co.yixiang.yshop.module.member.controller.admin.integralrule.vo;
|
||||
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import co.yixiang.yshop.framework.common.pojo.PageParam;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import static co.yixiang.yshop.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
|
||||
|
@ -1,10 +1,13 @@
|
||||
package co.yixiang.yshop.module.member.controller.admin.integralrule.vo;
|
||||
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import co.yixiang.yshop.framework.common.pojo.PageParam;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import static co.yixiang.yshop.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
|
||||
|
@ -2,6 +2,7 @@ package co.yixiang.yshop.module.member.controller.admin.integralrule.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Schema(description = "管理后台 - 会员积分规则 Response VO")
|
||||
|
@ -2,6 +2,7 @@ package co.yixiang.yshop.module.member.controller.admin.integralrule.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
import javax.validation.constraints.*;
|
||||
|
||||
|
@ -1,7 +1,9 @@
|
||||
package co.yixiang.yshop.module.member.controller.admin.signinrecord;
|
||||
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
@ -16,11 +18,13 @@ import java.io.IOException;
|
||||
|
||||
import co.yixiang.yshop.framework.common.pojo.PageResult;
|
||||
import co.yixiang.yshop.framework.common.pojo.CommonResult;
|
||||
|
||||
import static co.yixiang.yshop.framework.common.pojo.CommonResult.success;
|
||||
|
||||
import co.yixiang.yshop.framework.excel.core.util.ExcelUtils;
|
||||
|
||||
import co.yixiang.yshop.framework.operatelog.core.annotations.OperateLog;
|
||||
|
||||
import static co.yixiang.yshop.framework.operatelog.core.enums.OperateTypeEnum.*;
|
||||
|
||||
import co.yixiang.yshop.module.member.controller.admin.signinrecord.vo.*;
|
||||
@ -92,7 +96,7 @@ public class SignInRecordController {
|
||||
@PreAuthorize("@ss.hasPermission('member:sign-in-record:export')")
|
||||
@OperateLog(type = EXPORT)
|
||||
public void exportSignInRecordExcel(@Valid SignInRecordExportReqVO exportReqVO,
|
||||
HttpServletResponse response) throws IOException {
|
||||
HttpServletResponse response) throws IOException {
|
||||
List<SignInRecordDO> list = signInRecordService.getSignInRecordList(exportReqVO);
|
||||
// 导出 Excel
|
||||
List<SignInRecordExcelVO> datas = SignInRecordConvert.INSTANCE.convertList02(list);
|
||||
|
@ -10,9 +10,9 @@ import java.time.LocalDateTime;
|
||||
import javax.validation.constraints.*;
|
||||
|
||||
/**
|
||||
* 签到记录 Base VO,提供给添加、修改、详细的子 VO 使用
|
||||
* 如果子 VO 存在差异的字段,请不要添加到这里,影响 Swagger 文档生成
|
||||
*/
|
||||
* 签到记录 Base VO,提供给添加、修改、详细的子 VO 使用
|
||||
* 如果子 VO 存在差异的字段,请不要添加到这里,影响 Swagger 文档生成
|
||||
*/
|
||||
@Data
|
||||
public class SignInRecordBaseVO {
|
||||
|
||||
|
@ -1,8 +1,11 @@
|
||||
package co.yixiang.yshop.module.member.controller.admin.signinrecord.vo;
|
||||
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
import javax.validation.constraints.*;
|
||||
|
||||
@Schema(description = "管理后台 - 签到记录创建 Request VO")
|
||||
|
@ -2,6 +2,7 @@ package co.yixiang.yshop.module.member.controller.admin.signinrecord.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.LocalDateTime;
|
||||
|
@ -1,10 +1,14 @@
|
||||
package co.yixiang.yshop.module.member.controller.admin.signinrecord.vo;
|
||||
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import co.yixiang.yshop.framework.common.pojo.PageParam;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import static co.yixiang.yshop.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
|
||||
|
@ -1,10 +1,13 @@
|
||||
package co.yixiang.yshop.module.member.controller.admin.signinrecord.vo;
|
||||
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import co.yixiang.yshop.framework.common.pojo.PageParam;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import static co.yixiang.yshop.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
|
||||
|
@ -2,6 +2,7 @@ package co.yixiang.yshop.module.member.controller.admin.signinrecord.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
import javax.validation.constraints.*;
|
||||
|
||||
|
@ -120,7 +120,7 @@ public class MemberUserController {
|
||||
@PostMapping("updateTag")
|
||||
@Operation(summary = "更新用户标签")
|
||||
@PreAuthorize("@ss.hasPermission('member:user:update')")
|
||||
public CommonResult<Boolean> updateTag(@RequestBody UserUpdateTagDTO dto){
|
||||
public CommonResult<Boolean> updateTag(@RequestBody UserUpdateTagDTO dto) {
|
||||
userService.updateTag(dto);
|
||||
return CommonResult.success(true);
|
||||
}
|
||||
@ -134,5 +134,4 @@ public class MemberUserController {
|
||||
// }
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
@ -10,9 +10,9 @@ import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* 用户 Base VO,提供给添加、修改、详细的子 VO 使用
|
||||
* 如果子 VO 存在差异的字段,请不要添加到这里,影响 Swagger 文档生成
|
||||
*/
|
||||
* 用户 Base VO,提供给添加、修改、详细的子 VO 使用
|
||||
* 如果子 VO 存在差异的字段,请不要添加到这里,影响 Swagger 文档生成
|
||||
*/
|
||||
@Data
|
||||
public class UserBaseVO {
|
||||
|
||||
@ -129,5 +129,4 @@ public class UserBaseVO {
|
||||
private Integer signNum;
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
@ -1,11 +1,17 @@
|
||||
package co.yixiang.yshop.module.member.controller.admin.user.vo;
|
||||
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
import javax.validation.constraints.*;
|
||||
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import static co.yixiang.yshop.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
|
||||
|
||||
@Schema(description = "管理后台 - 用户创建 Request VO")
|
||||
|
@ -1,10 +1,13 @@
|
||||
package co.yixiang.yshop.module.member.controller.admin.user.vo;
|
||||
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import co.yixiang.yshop.framework.common.pojo.PageParam;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import static co.yixiang.yshop.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
|
||||
|
@ -4,6 +4,7 @@ import co.yixiang.yshop.module.member.controller.admin.usertagref.vo.UserTagRefR
|
||||
import co.yixiang.yshop.module.member.dal.dataobject.usertagref.UserTagRefDO;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
|
@ -35,5 +35,4 @@ public class UserUpdateMoneyReqVO {
|
||||
private String integral;
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
@ -2,10 +2,14 @@ package co.yixiang.yshop.module.member.controller.admin.user.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
import javax.validation.constraints.*;
|
||||
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import static co.yixiang.yshop.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
|
||||
|
||||
@Schema(description = "管理后台 - 用户更新 Request VO")
|
||||
|
@ -83,5 +83,4 @@ public class UserAddressController {
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
@ -3,12 +3,13 @@ package co.yixiang.yshop.module.member.controller.admin.useraddress.vo;
|
||||
import co.yixiang.yshop.framework.desensitize.core.slider.annotation.MobileDesensitize;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
|
||||
import javax.validation.constraints.*;
|
||||
|
||||
/**
|
||||
* 用户地址 Base VO,提供给添加、修改、详细的子 VO 使用
|
||||
* 如果子 VO 存在差异的字段,请不要添加到这里,影响 Swagger 文档生成
|
||||
*/
|
||||
* 用户地址 Base VO,提供给添加、修改、详细的子 VO 使用
|
||||
* 如果子 VO 存在差异的字段,请不要添加到这里,影响 Swagger 文档生成
|
||||
*/
|
||||
@Data
|
||||
public class UserAddressBaseVO {
|
||||
|
||||
|
@ -1,8 +1,11 @@
|
||||
package co.yixiang.yshop.module.member.controller.admin.useraddress.vo;
|
||||
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
import javax.validation.constraints.*;
|
||||
|
||||
@Schema(description = "管理后台 - 用户地址创建 Request VO")
|
||||
|
@ -1,10 +1,14 @@
|
||||
package co.yixiang.yshop.module.member.controller.admin.useraddress.vo;
|
||||
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import co.yixiang.yshop.framework.common.pojo.PageParam;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import static co.yixiang.yshop.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
|
||||
|
@ -1,10 +1,13 @@
|
||||
package co.yixiang.yshop.module.member.controller.admin.useraddress.vo;
|
||||
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import co.yixiang.yshop.framework.common.pojo.PageParam;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import static co.yixiang.yshop.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
|
||||
|
@ -2,6 +2,7 @@ package co.yixiang.yshop.module.member.controller.admin.useraddress.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Schema(description = "管理后台 - 用户地址 Response VO")
|
||||
|
@ -2,6 +2,7 @@ package co.yixiang.yshop.module.member.controller.admin.useraddress.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
import javax.validation.constraints.*;
|
||||
|
||||
|
@ -36,9 +36,4 @@ public class UserBillController {
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
@ -2,6 +2,7 @@ package co.yixiang.yshop.module.member.controller.admin.userbill.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
import java.math.BigDecimal;
|
||||
import java.math.BigDecimal;
|
||||
@ -10,9 +11,9 @@ import java.time.LocalDateTime;
|
||||
import javax.validation.constraints.*;
|
||||
|
||||
/**
|
||||
* 用户账单 Base VO,提供给添加、修改、详细的子 VO 使用
|
||||
* 如果子 VO 存在差异的字段,请不要添加到这里,影响 Swagger 文档生成
|
||||
*/
|
||||
* 用户账单 Base VO,提供给添加、修改、详细的子 VO 使用
|
||||
* 如果子 VO 存在差异的字段,请不要添加到这里,影响 Swagger 文档生成
|
||||
*/
|
||||
@Data
|
||||
public class UserBillBaseVO {
|
||||
|
||||
|
@ -1,8 +1,11 @@
|
||||
package co.yixiang.yshop.module.member.controller.admin.userbill.vo;
|
||||
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
import javax.validation.constraints.*;
|
||||
|
||||
@Schema(description = "管理后台 - 用户账单创建 Request VO")
|
||||
|
@ -4,9 +4,12 @@ import lombok.*;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.*;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import co.yixiang.yshop.framework.common.pojo.PageParam;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import static co.yixiang.yshop.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
|
||||
|
@ -19,7 +19,7 @@ public class UserBillModifyDTO {
|
||||
// 变动金额 包含负数
|
||||
private BigDecimal amount;
|
||||
// 变动后金额
|
||||
private BigDecimal afterAmount ;
|
||||
private BigDecimal afterAmount;
|
||||
// 关联id
|
||||
private Long linkId;
|
||||
// 变动类型
|
||||
|
@ -2,6 +2,7 @@ package co.yixiang.yshop.module.member.controller.admin.userbill.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
import javax.validation.constraints.*;
|
||||
|
||||
|
@ -1,7 +1,9 @@
|
||||
package co.yixiang.yshop.module.member.controller.admin.userinvitelog;
|
||||
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
@ -16,11 +18,13 @@ import java.io.IOException;
|
||||
|
||||
import co.yixiang.yshop.framework.common.pojo.PageResult;
|
||||
import co.yixiang.yshop.framework.common.pojo.CommonResult;
|
||||
|
||||
import static co.yixiang.yshop.framework.common.pojo.CommonResult.success;
|
||||
|
||||
import co.yixiang.yshop.framework.excel.core.util.ExcelUtils;
|
||||
|
||||
import co.yixiang.yshop.framework.operatelog.core.annotations.OperateLog;
|
||||
|
||||
import static co.yixiang.yshop.framework.operatelog.core.enums.OperateTypeEnum.*;
|
||||
|
||||
import co.yixiang.yshop.module.member.controller.admin.userinvitelog.vo.*;
|
||||
@ -92,7 +96,7 @@ public class UserInviteLogController {
|
||||
@PreAuthorize("@ss.hasPermission('member:user-invite-log:export')")
|
||||
@OperateLog(type = EXPORT)
|
||||
public void exportUserInviteLogExcel(@Valid UserInviteLogExportReqVO exportReqVO,
|
||||
HttpServletResponse response) throws IOException {
|
||||
HttpServletResponse response) throws IOException {
|
||||
List<UserInviteLogDO> list = userInviteLogService.getUserInviteLogList(exportReqVO);
|
||||
// 导出 Excel
|
||||
List<UserInviteLogExcelVO> datas = UserInviteLogConvert.INSTANCE.convertList02(list);
|
||||
|
@ -2,15 +2,16 @@ package co.yixiang.yshop.module.member.controller.admin.userinvitelog.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.LocalDateTime;
|
||||
import javax.validation.constraints.*;
|
||||
|
||||
/**
|
||||
* 邀请日志 Base VO,提供给添加、修改、详细的子 VO 使用
|
||||
* 如果子 VO 存在差异的字段,请不要添加到这里,影响 Swagger 文档生成
|
||||
*/
|
||||
* 邀请日志 Base VO,提供给添加、修改、详细的子 VO 使用
|
||||
* 如果子 VO 存在差异的字段,请不要添加到这里,影响 Swagger 文档生成
|
||||
*/
|
||||
@Data
|
||||
public class UserInviteLogBaseVO {
|
||||
|
||||
|
@ -1,8 +1,11 @@
|
||||
package co.yixiang.yshop.module.member.controller.admin.userinvitelog.vo;
|
||||
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
import javax.validation.constraints.*;
|
||||
|
||||
@Schema(description = "管理后台 - 邀请日志创建 Request VO")
|
||||
|
@ -2,6 +2,7 @@ package co.yixiang.yshop.module.member.controller.admin.userinvitelog.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.LocalDateTime;
|
||||
|
@ -1,10 +1,14 @@
|
||||
package co.yixiang.yshop.module.member.controller.admin.userinvitelog.vo;
|
||||
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import co.yixiang.yshop.framework.common.pojo.PageParam;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import static co.yixiang.yshop.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
|
||||
|
@ -1,10 +1,13 @@
|
||||
package co.yixiang.yshop.module.member.controller.admin.userinvitelog.vo;
|
||||
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import co.yixiang.yshop.framework.common.pojo.PageParam;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import static co.yixiang.yshop.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
|
||||
|
@ -2,6 +2,7 @@ package co.yixiang.yshop.module.member.controller.admin.userinvitelog.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Schema(description = "管理后台 - 邀请日志 Response VO")
|
||||
|
@ -2,6 +2,7 @@ package co.yixiang.yshop.module.member.controller.admin.userinvitelog.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
import javax.validation.constraints.*;
|
||||
|
||||
|
@ -1,7 +1,9 @@
|
||||
package co.yixiang.yshop.module.member.controller.admin.userlevelconfig;
|
||||
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
@ -16,11 +18,13 @@ import java.io.IOException;
|
||||
|
||||
import co.yixiang.yshop.framework.common.pojo.PageResult;
|
||||
import co.yixiang.yshop.framework.common.pojo.CommonResult;
|
||||
|
||||
import static co.yixiang.yshop.framework.common.pojo.CommonResult.success;
|
||||
|
||||
import co.yixiang.yshop.framework.excel.core.util.ExcelUtils;
|
||||
|
||||
import co.yixiang.yshop.framework.operatelog.core.annotations.OperateLog;
|
||||
|
||||
import static co.yixiang.yshop.framework.operatelog.core.enums.OperateTypeEnum.*;
|
||||
|
||||
import co.yixiang.yshop.module.member.controller.admin.userlevelconfig.vo.*;
|
||||
@ -92,7 +96,7 @@ public class UserLevelConfigController {
|
||||
@PreAuthorize("@ss.hasPermission('member:user-level-config:export')")
|
||||
@OperateLog(type = EXPORT)
|
||||
public void exportUserLevelConfigExcel(@Valid UserLevelConfigExportReqVO exportReqVO,
|
||||
HttpServletResponse response) throws IOException {
|
||||
HttpServletResponse response) throws IOException {
|
||||
List<UserLevelConfigDO> list = userLevelConfigService.getUserLevelConfigList(exportReqVO);
|
||||
// 导出 Excel
|
||||
List<UserLevelConfigExcelVO> datas = UserLevelConfigConvert.INSTANCE.convertList02(list);
|
||||
|
@ -6,9 +6,9 @@ import lombok.Data;
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
||||
/**
|
||||
* 会员等级配置 Base VO,提供给添加、修改、详细的子 VO 使用
|
||||
* 如果子 VO 存在差异的字段,请不要添加到这里,影响 Swagger 文档生成
|
||||
*/
|
||||
* 会员等级配置 Base VO,提供给添加、修改、详细的子 VO 使用
|
||||
* 如果子 VO 存在差异的字段,请不要添加到这里,影响 Swagger 文档生成
|
||||
*/
|
||||
@Data
|
||||
public class UserLevelConfigBaseVO {
|
||||
|
||||
|
@ -2,8 +2,11 @@ package co.yixiang.yshop.module.member.controller.admin.userlevelconfig.vo;
|
||||
|
||||
import co.yixiang.yshop.module.member.controller.admin.userlevelequityref.vo.UserLevelEquityRefCreateReqVO;
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
import javax.validation.constraints.*;
|
||||
|
||||
@Schema(description = "管理后台 - 会员等级配置创建 Request VO")
|
||||
|
@ -2,6 +2,7 @@ package co.yixiang.yshop.module.member.controller.admin.userlevelconfig.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.LocalDateTime;
|
||||
|
@ -1,10 +1,14 @@
|
||||
package co.yixiang.yshop.module.member.controller.admin.userlevelconfig.vo;
|
||||
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import co.yixiang.yshop.framework.common.pojo.PageParam;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import static co.yixiang.yshop.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
|
||||
|
@ -1,10 +1,13 @@
|
||||
package co.yixiang.yshop.module.member.controller.admin.userlevelconfig.vo;
|
||||
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import co.yixiang.yshop.framework.common.pojo.PageParam;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import static co.yixiang.yshop.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
|
||||
|
@ -4,6 +4,7 @@ import co.yixiang.yshop.module.member.controller.admin.userlevelequityref.vo.Use
|
||||
import co.yixiang.yshop.module.member.controller.admin.userlevelequityref.vo.UserLevelEquityRefRespVO;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
|
@ -3,6 +3,7 @@ package co.yixiang.yshop.module.member.controller.admin.userlevelconfig.vo;
|
||||
import co.yixiang.yshop.module.member.controller.admin.userlevelequityref.vo.UserLevelEquityRefCreateReqVO;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
import javax.validation.constraints.*;
|
||||
|
||||
|
@ -1,7 +1,9 @@
|
||||
package co.yixiang.yshop.module.member.controller.admin.userlevelequity;
|
||||
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
@ -16,11 +18,13 @@ import java.io.IOException;
|
||||
|
||||
import co.yixiang.yshop.framework.common.pojo.PageResult;
|
||||
import co.yixiang.yshop.framework.common.pojo.CommonResult;
|
||||
|
||||
import static co.yixiang.yshop.framework.common.pojo.CommonResult.success;
|
||||
|
||||
import co.yixiang.yshop.framework.excel.core.util.ExcelUtils;
|
||||
|
||||
import co.yixiang.yshop.framework.operatelog.core.annotations.OperateLog;
|
||||
|
||||
import static co.yixiang.yshop.framework.operatelog.core.enums.OperateTypeEnum.*;
|
||||
|
||||
import co.yixiang.yshop.module.member.controller.admin.userlevelequity.vo.*;
|
||||
@ -91,7 +95,7 @@ public class UserLevelEquityController {
|
||||
@PreAuthorize("@ss.hasPermission('member:user-level-equity:export')")
|
||||
@OperateLog(type = EXPORT)
|
||||
public void exportUserLevelEquityExcel(@Valid UserLevelEquityExportReqVO exportReqVO,
|
||||
HttpServletResponse response) throws IOException {
|
||||
HttpServletResponse response) throws IOException {
|
||||
List<UserLevelEquityDO> list = userLevelEquityService.getUserLevelEquityList(exportReqVO);
|
||||
// 导出 Excel
|
||||
List<UserLevelEquityExcelVO> datas = UserLevelEquityConvert.INSTANCE.convertList02(list);
|
||||
|
@ -4,9 +4,9 @@ import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 会员等级权益配置 Base VO,提供给添加、修改、详细的子 VO 使用
|
||||
* 如果子 VO 存在差异的字段,请不要添加到这里,影响 Swagger 文档生成
|
||||
*/
|
||||
* 会员等级权益配置 Base VO,提供给添加、修改、详细的子 VO 使用
|
||||
* 如果子 VO 存在差异的字段,请不要添加到这里,影响 Swagger 文档生成
|
||||
*/
|
||||
@Data
|
||||
public class UserLevelEquityBaseVO {
|
||||
|
||||
|
@ -1,8 +1,11 @@
|
||||
package co.yixiang.yshop.module.member.controller.admin.userlevelequity.vo;
|
||||
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
import javax.validation.constraints.*;
|
||||
|
||||
@Schema(description = "管理后台 - 会员等级权益配置创建 Request VO")
|
||||
|
@ -2,6 +2,7 @@ package co.yixiang.yshop.module.member.controller.admin.userlevelequity.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.LocalDateTime;
|
||||
@ -26,7 +27,6 @@ public class UserLevelEquityExcelVO {
|
||||
private String typeName;
|
||||
|
||||
|
||||
|
||||
@ExcelProperty("创建时间")
|
||||
private LocalDateTime createTime;
|
||||
|
||||
|
@ -1,10 +1,14 @@
|
||||
package co.yixiang.yshop.module.member.controller.admin.userlevelequity.vo;
|
||||
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import co.yixiang.yshop.framework.common.pojo.PageParam;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import static co.yixiang.yshop.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
|
||||
|
@ -1,10 +1,13 @@
|
||||
package co.yixiang.yshop.module.member.controller.admin.userlevelequity.vo;
|
||||
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import co.yixiang.yshop.framework.common.pojo.PageParam;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import static co.yixiang.yshop.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
|
||||
|
@ -2,6 +2,7 @@ package co.yixiang.yshop.module.member.controller.admin.userlevelequity.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Schema(description = "管理后台 - 会员等级权益配置 Response VO")
|
||||
|
@ -2,6 +2,7 @@ package co.yixiang.yshop.module.member.controller.admin.userlevelequity.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
import javax.validation.constraints.*;
|
||||
|
||||
|
@ -1,7 +1,9 @@
|
||||
package co.yixiang.yshop.module.member.controller.admin.userlevelequityref;
|
||||
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
@ -16,11 +18,13 @@ import java.io.IOException;
|
||||
|
||||
import co.yixiang.yshop.framework.common.pojo.PageResult;
|
||||
import co.yixiang.yshop.framework.common.pojo.CommonResult;
|
||||
|
||||
import static co.yixiang.yshop.framework.common.pojo.CommonResult.success;
|
||||
|
||||
import co.yixiang.yshop.framework.excel.core.util.ExcelUtils;
|
||||
|
||||
import co.yixiang.yshop.framework.operatelog.core.annotations.OperateLog;
|
||||
|
||||
import static co.yixiang.yshop.framework.operatelog.core.enums.OperateTypeEnum.*;
|
||||
|
||||
import co.yixiang.yshop.module.member.controller.admin.userlevelequityref.vo.*;
|
||||
@ -92,7 +96,7 @@ public class UserLevelEquityRefController {
|
||||
@PreAuthorize("@ss.hasPermission('member:user-level-equity-ref:export')")
|
||||
@OperateLog(type = EXPORT)
|
||||
public void exportUserLevelEquityRefExcel(@Valid UserLevelEquityRefExportReqVO exportReqVO,
|
||||
HttpServletResponse response) throws IOException {
|
||||
HttpServletResponse response) throws IOException {
|
||||
List<UserLevelEquityRefDO> list = userLevelEquityRefService.getUserLevelEquityRefList(exportReqVO);
|
||||
// 导出 Excel
|
||||
List<UserLevelEquityRefExcelVO> datas = UserLevelEquityRefConvert.INSTANCE.convertList02(list);
|
||||
|
@ -2,15 +2,16 @@ package co.yixiang.yshop.module.member.controller.admin.userlevelequityref.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.LocalDateTime;
|
||||
import javax.validation.constraints.*;
|
||||
|
||||
/**
|
||||
* 会员等级权益中间 Base VO,提供给添加、修改、详细的子 VO 使用
|
||||
* 如果子 VO 存在差异的字段,请不要添加到这里,影响 Swagger 文档生成
|
||||
*/
|
||||
* 会员等级权益中间 Base VO,提供给添加、修改、详细的子 VO 使用
|
||||
* 如果子 VO 存在差异的字段,请不要添加到这里,影响 Swagger 文档生成
|
||||
*/
|
||||
@Data
|
||||
public class UserLevelEquityRefBaseVO {
|
||||
|
||||
|
@ -1,8 +1,11 @@
|
||||
package co.yixiang.yshop.module.member.controller.admin.userlevelequityref.vo;
|
||||
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
import javax.validation.constraints.*;
|
||||
|
||||
@Schema(description = "管理后台 - 会员等级权益中间创建 Request VO")
|
||||
|
@ -2,6 +2,7 @@ package co.yixiang.yshop.module.member.controller.admin.userlevelequityref.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.LocalDateTime;
|
||||
|
@ -1,10 +1,14 @@
|
||||
package co.yixiang.yshop.module.member.controller.admin.userlevelequityref.vo;
|
||||
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import co.yixiang.yshop.framework.common.pojo.PageParam;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import static co.yixiang.yshop.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
|
||||
|
@ -1,10 +1,13 @@
|
||||
package co.yixiang.yshop.module.member.controller.admin.userlevelequityref.vo;
|
||||
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import co.yixiang.yshop.framework.common.pojo.PageParam;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import static co.yixiang.yshop.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
|
||||
|
@ -2,6 +2,7 @@ package co.yixiang.yshop.module.member.controller.admin.userlevelequityref.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Schema(description = "管理后台 - 会员等级权益中间 Response VO")
|
||||
|
@ -2,6 +2,7 @@ package co.yixiang.yshop.module.member.controller.admin.userlevelequityref.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
import javax.validation.constraints.*;
|
||||
|
||||
|
@ -1,7 +1,9 @@
|
||||
package co.yixiang.yshop.module.member.controller.admin.userlevelgrowthvalueconfig;
|
||||
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
@ -16,11 +18,13 @@ import java.io.IOException;
|
||||
|
||||
import co.yixiang.yshop.framework.common.pojo.PageResult;
|
||||
import co.yixiang.yshop.framework.common.pojo.CommonResult;
|
||||
|
||||
import static co.yixiang.yshop.framework.common.pojo.CommonResult.success;
|
||||
|
||||
import co.yixiang.yshop.framework.excel.core.util.ExcelUtils;
|
||||
|
||||
import co.yixiang.yshop.framework.operatelog.core.annotations.OperateLog;
|
||||
|
||||
import static co.yixiang.yshop.framework.operatelog.core.enums.OperateTypeEnum.*;
|
||||
|
||||
import co.yixiang.yshop.module.member.controller.admin.userlevelgrowthvalueconfig.vo.*;
|
||||
@ -92,7 +96,7 @@ public class UserLevelGrowthValueConfigController {
|
||||
@PreAuthorize("@ss.hasPermission('member:user-level-growth-value-config:export')")
|
||||
@OperateLog(type = EXPORT)
|
||||
public void exportUserLevelGrowthValueConfigExcel(@Valid UserLevelGrowthValueConfigExportReqVO exportReqVO,
|
||||
HttpServletResponse response) throws IOException {
|
||||
HttpServletResponse response) throws IOException {
|
||||
List<UserLevelGrowthValueConfigDO> list = userLevelGrowthValueConfigService.getUserLevelGrowthValueConfigList(exportReqVO);
|
||||
// 导出 Excel
|
||||
List<UserLevelGrowthValueConfigExcelVO> datas = UserLevelGrowthValueConfigConvert.INSTANCE.convertList02(list);
|
||||
|
@ -4,9 +4,9 @@ import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 会员成长任务配置 Base VO,提供给添加、修改、详细的子 VO 使用
|
||||
* 如果子 VO 存在差异的字段,请不要添加到这里,影响 Swagger 文档生成
|
||||
*/
|
||||
* 会员成长任务配置 Base VO,提供给添加、修改、详细的子 VO 使用
|
||||
* 如果子 VO 存在差异的字段,请不要添加到这里,影响 Swagger 文档生成
|
||||
*/
|
||||
@Data
|
||||
public class UserLevelGrowthValueConfigBaseVO {
|
||||
|
||||
|
@ -1,8 +1,11 @@
|
||||
package co.yixiang.yshop.module.member.controller.admin.userlevelgrowthvalueconfig.vo;
|
||||
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
import javax.validation.constraints.*;
|
||||
|
||||
@Schema(description = "管理后台 - 会员成长任务配置创建 Request VO")
|
||||
|
@ -2,6 +2,7 @@ package co.yixiang.yshop.module.member.controller.admin.userlevelgrowthvalueconf
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.LocalDateTime;
|
||||
|
@ -1,10 +1,14 @@
|
||||
package co.yixiang.yshop.module.member.controller.admin.userlevelgrowthvalueconfig.vo;
|
||||
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import co.yixiang.yshop.framework.common.pojo.PageParam;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import static co.yixiang.yshop.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
|
||||
|
@ -1,10 +1,13 @@
|
||||
package co.yixiang.yshop.module.member.controller.admin.userlevelgrowthvalueconfig.vo;
|
||||
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import co.yixiang.yshop.framework.common.pojo.PageParam;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import static co.yixiang.yshop.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
|
||||
|
@ -2,6 +2,7 @@ package co.yixiang.yshop.module.member.controller.admin.userlevelgrowthvalueconf
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Schema(description = "管理后台 - 会员成长任务配置 Response VO")
|
||||
|
@ -2,6 +2,7 @@ package co.yixiang.yshop.module.member.controller.admin.userlevelgrowthvalueconf
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
import javax.validation.constraints.*;
|
||||
|
||||
|
@ -1,7 +1,9 @@
|
||||
package co.yixiang.yshop.module.member.controller.admin.usertag;
|
||||
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
@ -16,11 +18,13 @@ import java.io.IOException;
|
||||
|
||||
import co.yixiang.yshop.framework.common.pojo.PageResult;
|
||||
import co.yixiang.yshop.framework.common.pojo.CommonResult;
|
||||
|
||||
import static co.yixiang.yshop.framework.common.pojo.CommonResult.success;
|
||||
|
||||
import co.yixiang.yshop.framework.excel.core.util.ExcelUtils;
|
||||
|
||||
import co.yixiang.yshop.framework.operatelog.core.annotations.OperateLog;
|
||||
|
||||
import static co.yixiang.yshop.framework.operatelog.core.enums.OperateTypeEnum.*;
|
||||
|
||||
import co.yixiang.yshop.module.member.controller.admin.usertag.vo.*;
|
||||
@ -91,7 +95,7 @@ public class UserTagController {
|
||||
@PreAuthorize("@ss.hasPermission('member:user-tag:export')")
|
||||
@OperateLog(type = EXPORT)
|
||||
public void exportUserTagExcel(@Valid UserTagExportReqVO exportReqVO,
|
||||
HttpServletResponse response) throws IOException {
|
||||
HttpServletResponse response) throws IOException {
|
||||
List<UserTagDO> list = userTagService.getUserTagList(exportReqVO);
|
||||
// 导出 Excel
|
||||
List<UserTagExcelVO> datas = UserTagConvert.INSTANCE.convertList02(list);
|
||||
|
@ -2,15 +2,16 @@ package co.yixiang.yshop.module.member.controller.admin.usertag.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.LocalDateTime;
|
||||
import javax.validation.constraints.*;
|
||||
|
||||
/**
|
||||
* 会员标签 Base VO,提供给添加、修改、详细的子 VO 使用
|
||||
* 如果子 VO 存在差异的字段,请不要添加到这里,影响 Swagger 文档生成
|
||||
*/
|
||||
* 会员标签 Base VO,提供给添加、修改、详细的子 VO 使用
|
||||
* 如果子 VO 存在差异的字段,请不要添加到这里,影响 Swagger 文档生成
|
||||
*/
|
||||
@Data
|
||||
public class UserTagBaseVO {
|
||||
|
||||
|
@ -1,8 +1,11 @@
|
||||
package co.yixiang.yshop.module.member.controller.admin.usertag.vo;
|
||||
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
import javax.validation.constraints.*;
|
||||
|
||||
@Schema(description = "管理后台 - 会员标签创建 Request VO")
|
||||
|
@ -2,6 +2,7 @@ package co.yixiang.yshop.module.member.controller.admin.usertag.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.LocalDateTime;
|
||||
|
@ -1,10 +1,14 @@
|
||||
package co.yixiang.yshop.module.member.controller.admin.usertag.vo;
|
||||
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import co.yixiang.yshop.framework.common.pojo.PageParam;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import static co.yixiang.yshop.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
|
||||
|
@ -1,10 +1,13 @@
|
||||
package co.yixiang.yshop.module.member.controller.admin.usertag.vo;
|
||||
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import co.yixiang.yshop.framework.common.pojo.PageParam;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import static co.yixiang.yshop.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
|
||||
|
@ -3,6 +3,7 @@ package co.yixiang.yshop.module.member.controller.admin.usertag.vo;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Schema(description = "管理后台 - 会员标签 Response VO")
|
||||
|
@ -2,6 +2,7 @@ package co.yixiang.yshop.module.member.controller.admin.usertag.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
import javax.validation.constraints.*;
|
||||
|
||||
|
@ -1,7 +1,9 @@
|
||||
package co.yixiang.yshop.module.member.controller.admin.usertaggroup;
|
||||
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
@ -16,11 +18,13 @@ import java.io.IOException;
|
||||
|
||||
import co.yixiang.yshop.framework.common.pojo.PageResult;
|
||||
import co.yixiang.yshop.framework.common.pojo.CommonResult;
|
||||
|
||||
import static co.yixiang.yshop.framework.common.pojo.CommonResult.success;
|
||||
|
||||
import co.yixiang.yshop.framework.excel.core.util.ExcelUtils;
|
||||
|
||||
import co.yixiang.yshop.framework.operatelog.core.annotations.OperateLog;
|
||||
|
||||
import static co.yixiang.yshop.framework.operatelog.core.enums.OperateTypeEnum.*;
|
||||
|
||||
import co.yixiang.yshop.module.member.controller.admin.usertaggroup.vo.*;
|
||||
@ -91,7 +95,7 @@ public class UserTagGroupController {
|
||||
@PreAuthorize("@ss.hasPermission('member:user-tag-group:export')")
|
||||
@OperateLog(type = EXPORT)
|
||||
public void exportUserTagGroupExcel(@Valid UserTagGroupExportReqVO exportReqVO,
|
||||
HttpServletResponse response) throws IOException {
|
||||
HttpServletResponse response) throws IOException {
|
||||
List<UserTagGroupDO> list = userTagGroupService.getUserTagGroupList(exportReqVO);
|
||||
// 导出 Excel
|
||||
List<UserTagGroupExcelVO> datas = UserTagGroupConvert.INSTANCE.convertList02(list);
|
||||
|
@ -2,15 +2,16 @@ package co.yixiang.yshop.module.member.controller.admin.usertaggroup.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.LocalDateTime;
|
||||
import javax.validation.constraints.*;
|
||||
|
||||
/**
|
||||
* 会员标签分组 Base VO,提供给添加、修改、详细的子 VO 使用
|
||||
* 如果子 VO 存在差异的字段,请不要添加到这里,影响 Swagger 文档生成
|
||||
*/
|
||||
* 会员标签分组 Base VO,提供给添加、修改、详细的子 VO 使用
|
||||
* 如果子 VO 存在差异的字段,请不要添加到这里,影响 Swagger 文档生成
|
||||
*/
|
||||
@Data
|
||||
public class UserTagGroupBaseVO {
|
||||
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user