diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/IndexController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/IndexController.java index cdcfed62a..0c3bdecc8 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/controller/IndexController.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/IndexController.java @@ -25,4 +25,22 @@ public class IndexController { return StringUtils.format("欢迎使用{}后台管理框架，请通过前端地址访问。", SpringUtils.getApplicationName()); } + + /** + * 获取数量统计 + */ +// public List< String> + + + /** + * 获取今日待办任务 + */ + + /** + * 获取流量概括 + */ + /** + * 获取今日概括 + */ + } diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/core/BaseController.java b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/core/BaseController.java index 8f204e75a..5c95a766f 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/core/BaseController.java +++ b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/core/BaseController.java @@ -1,25 +1,58 @@ package org.dromara.common.web.core; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.esotericsoftware.kryo.serializers.TaggedFieldSerializer; import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.BaseBO; import org.dromara.common.core.domain.R; import org.dromara.common.core.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; /** * web层通用数据处理 * * @author Lion Li */ +@RequiredArgsConstructor +@RestController public class BaseController { -// @Autowired -// public S service; +// public final S service; // -// @Autowired -// public C convert; +// public final C convert; +// @PostMapping("/list") +// public R> list(@RequestBody B bo, @RequestBody Page page) { +// IPage pages = service.page(page, bo.toWrapper()); +// return R.ok(convert.toVO(pages)); +// } + +// @PostMapping("/add") +// public R add(@RequestBody B bo) { +// return R.ok(service.save(convert.toPo(bo))); +// } +// +// @GetMapping(value = "/{id}") +// public R getInfo(@PathVariable("id") Long id) { +// return R.ok(convert.toVO(service.getById(id))); +// } +// +// @PostMapping("/update") +// public R update(@RequestBody B bo) { +// service.save(convert.toPo(bo)); +// return R.ok(); +// } +// +// +// @DeleteMapping("/{id}") +// public R remove(@PathVariable Long id) { +// return R.ok(service.removeById(id)); +// } + /** * 响应返回结果 * diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/DarrenController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/DarrenController.java new file mode 100644 index 000000000..6220b3637 --- /dev/null +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/DarrenController.java @@ -0,0 +1,26 @@ +package com.wzj.soopin.member.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.wzj.soopin.member.domain.bo.FansBO; +import com.wzj.soopin.member.domain.po.Fans; +import com.wzj.soopin.member.domain.vo.FansVO; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 达人 + */ +@Tag(name = "达人") +@RestController +@RequestMapping("/ums/darren") +@RequiredArgsConstructor +public class DarrenController { + +} diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberBankController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberBankController.java new file mode 100644 index 000000000..23b485443 --- /dev/null +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberBankController.java @@ -0,0 +1,76 @@ +package com.wzj.soopin.member.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.wzj.soopin.member.convert.FeedbackConvert; +import com.wzj.soopin.member.convert.MemberBankConvert; +import com.wzj.soopin.member.convert.MemberConvert; +import com.wzj.soopin.member.domain.bo.FeedbackBO; +import com.wzj.soopin.member.domain.bo.MemberBankBO; +import com.wzj.soopin.member.domain.po.Feedback; +import com.wzj.soopin.member.domain.po.Member; +import com.wzj.soopin.member.domain.po.MemberBank; +import com.wzj.soopin.member.domain.vo.FeedbackVO; +import com.wzj.soopin.member.domain.vo.MemberBankVO; +import com.wzj.soopin.member.service.IFeedbackService; +import com.wzj.soopin.member.service.IMemberBankService; +import com.wzj.soopin.member.service.IMemberService; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.constant.CacheConstants; +import org.dromara.common.core.domain.R; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.redis.utils.RedisUtils; +import org.springframework.web.bind.annotation.*; + +import java.util.stream.Collectors; + +/** + * 用户银行卡 + */ +@Tag(name = "用户银行卡") +@RestController +@RequestMapping("/ums/bank") +@RequiredArgsConstructor +public class MemberBankController { + + private final IMemberBankService service; + private final MemberBankConvert convert; + + @Tag(name = "查询 列表") + @PostMapping("/list") + public R> list(@RequestBody MemberBankBO bo, @RequestBody Page page) { + Page pages = service.page(page, bo.toWrapper()); + return R.ok(convert.toVO(pages)); + } + + @Tag(name = "新增") + @Log(title = "新增 ", businessType = BusinessType.INSERT) + @PostMapping("/add") + public R add(@RequestBody MemberBankBO bo) { + return R.ok(service.save(convert.toPo(bo))); + } + + @Tag(name = "详情") + @GetMapping(value = "/{id}") + public R getInfo(@PathVariable("id") Long id) { + return R.ok(convert.toVO(service.getById(id))); + } + + @Tag(name = ("处理")) + @Log(title = "修改", businessType = BusinessType.UPDATE) + @PostMapping("/update") + public R update(@RequestBody MemberBankBO bo) { + service.save(convert.toPo(bo)); + return R.ok(); + } + + + @Tag(name = "删除") + @Log(title = "删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{id}") + public R remove(@PathVariable Long id) { + return R.ok(service.removeById(id)); + } +} diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberForbiddenController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberForbiddenController.java new file mode 100644 index 000000000..759af0f93 --- /dev/null +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberForbiddenController.java @@ -0,0 +1,69 @@ +package com.wzj.soopin.member.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.wzj.soopin.member.convert.MemberBankConvert; +import com.wzj.soopin.member.convert.MemberForbiddenConvert; +import com.wzj.soopin.member.domain.bo.MemberBankBO; +import com.wzj.soopin.member.domain.bo.MemberForbiddenBO; +import com.wzj.soopin.member.domain.po.MemberBank; +import com.wzj.soopin.member.domain.po.MemberForbidden; +import com.wzj.soopin.member.domain.vo.MemberBankVO; +import com.wzj.soopin.member.domain.vo.MemberForbiddenVO; +import com.wzj.soopin.member.service.IMemberBankService; +import com.wzj.soopin.member.service.IMemberForbiddenService; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.springframework.web.bind.annotation.*; + +/** + * 用户封禁 + */ +@Tag(name = "用户封禁") +@RestController +@RequestMapping("/ums/forbidden") +@RequiredArgsConstructor +public class MemberForbiddenController { + + private final IMemberForbiddenService service; + private final MemberForbiddenConvert convert; + + @Tag(name = "查询列表") + @PostMapping("/list") + public R> list(@RequestBody MemberForbiddenBO bo, @RequestBody Page page) { + Page pages = service.page(page, bo.toWrapper()); + return R.ok(convert.toVO(pages)); + } + + @Tag(name = "新增") + @Log(title = "新增 ", businessType = BusinessType.INSERT) + @PostMapping("/add") + public R add(@RequestBody MemberForbiddenBO bo) { + return R.ok(service.save(convert.toPo(bo))); + } + + @Tag(name = "详情") + @GetMapping(value = "/{id}") + public R getInfo(@PathVariable("id") Long id) { + return R.ok(convert.toVO(service.getById(id))); + } + + @Tag(name = ("处理")) + @Log(title = "修改", businessType = BusinessType.UPDATE) + @PostMapping("/update") + public R update(@RequestBody MemberForbiddenBO bo) { + service.save(convert.toPo(bo)); + return R.ok(); + } + + + @Tag(name = "删除") + @Log(title = "删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{id}") + public R remove(@PathVariable Long id) { + return R.ok(service.removeById(id)); + } +} diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/TenantForbiddenController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/TenantForbiddenController.java new file mode 100644 index 000000000..21df21b60 --- /dev/null +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/TenantForbiddenController.java @@ -0,0 +1,64 @@ +package com.wzj.soopin.member.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.wzj.soopin.member.convert.TenantForbiddenConvert; +import com.wzj.soopin.member.domain.bo.TenantForbiddenBO; +import com.wzj.soopin.member.domain.po.TenantForbidden; +import com.wzj.soopin.member.domain.vo.TenantForbiddenVO; +import com.wzj.soopin.member.service.ITenantForbiddenService; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.springframework.web.bind.annotation.*; + +/** + * 用户封禁 + */ +@Tag(name = "用户封禁") +@RestController +@RequestMapping("/system/tenant/forbidden") +@RequiredArgsConstructor +public class TenantForbiddenController { + + private final ITenantForbiddenService service; + private final TenantForbiddenConvert convert; + + @Tag(name = "查询列表") + @PostMapping("/list") + public R> list(@RequestBody TenantForbiddenBO bo, @RequestBody Page page) { + Page pages = service.page(page, bo.toWrapper()); + return R.ok(convert.toVO(pages)); + } + + @Tag(name = "新增") + @Log(title = "新增 ", businessType = BusinessType.INSERT) + @PostMapping("/add") + public R add(@RequestBody TenantForbiddenBO bo) { + return R.ok(service.save(convert.toPo(bo))); + } + + @Tag(name = "详情") + @GetMapping(value = "/{id}") + public R getInfo(@PathVariable("id") Long id) { + return R.ok(convert.toVO(service.getById(id))); + } + + @Tag(name = ("处理")) + @Log(title = "修改", businessType = BusinessType.UPDATE) + @PostMapping("/update") + public R update(@RequestBody TenantForbiddenBO bo) { + service.save(convert.toPo(bo)); + return R.ok(); + } + + + @Tag(name = "删除") + @Log(title = "删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{id}") + public R remove(@PathVariable Long id) { + return R.ok(service.removeById(id)); + } +} diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/convert/FansConvert.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/convert/FansConvert.java index 70aaf9c25..5bbd3bec6 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/convert/FansConvert.java +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/convert/FansConvert.java @@ -17,11 +17,4 @@ import org.mapstruct.Mapping; */ @Mapper(componentModel = "spring",uses = BaseConverter.class) public interface FansConvert extends BaseConverter { - - @Override - @Mapping(target = "vlogger.id",source = "vloggerId") - @Mapping(target = "fan.id", source = "fanId") - @Mapping(target = "fanId", source = "fanId") - @Mapping(target = "vloggerId", source = "vloggerId") - FansVO toVO(Fans fans); } diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/convert/MemberBankConvert.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/convert/MemberBankConvert.java new file mode 100644 index 000000000..fa1ff24c0 --- /dev/null +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/convert/MemberBankConvert.java @@ -0,0 +1,16 @@ +package com.wzj.soopin.member.convert; + +import com.wzj.soopin.member.domain.bo.MemberBankBO; +import com.wzj.soopin.member.domain.po.MemberBank; +import com.wzj.soopin.member.domain.vo.MemberBankVO; +import org.dromara.common.web.core.BaseConverter; +import org.mapstruct.Mapper; + +/** + * 银行卡 + * + * @author zcc + */ +@Mapper(componentModel = "spring",uses = BaseConverter.class) +public interface MemberBankConvert extends BaseConverter { +} diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/convert/MemberForbiddenConvert.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/convert/MemberForbiddenConvert.java new file mode 100644 index 000000000..a757e06e6 --- /dev/null +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/convert/MemberForbiddenConvert.java @@ -0,0 +1,19 @@ +package com.wzj.soopin.member.convert; + +import com.wzj.soopin.member.domain.bo.FansBO; +import com.wzj.soopin.member.domain.bo.MemberForbiddenBO; +import com.wzj.soopin.member.domain.po.Fans; +import com.wzj.soopin.member.domain.po.MemberForbidden; +import com.wzj.soopin.member.domain.vo.FansVO; +import com.wzj.soopin.member.domain.vo.MemberForbiddenVO; +import org.dromara.common.web.core.BaseConverter; +import org.mapstruct.Mapper; + +/** + * 粉丝与关注 DO <=> VO / BO + * + * @author zcc + */ +@Mapper(componentModel = "spring",uses = BaseConverter.class) +public interface MemberForbiddenConvert extends BaseConverter { +} diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/convert/TenantForbiddenConvert.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/convert/TenantForbiddenConvert.java new file mode 100644 index 000000000..e3aff94f0 --- /dev/null +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/convert/TenantForbiddenConvert.java @@ -0,0 +1,19 @@ +package com.wzj.soopin.member.convert; + +import com.wzj.soopin.member.domain.bo.MemberForbiddenBO; +import com.wzj.soopin.member.domain.bo.TenantForbiddenBO; +import com.wzj.soopin.member.domain.po.MemberForbidden; +import com.wzj.soopin.member.domain.po.TenantForbidden; +import com.wzj.soopin.member.domain.vo.MemberForbiddenVO; +import com.wzj.soopin.member.domain.vo.TenantForbiddenVO; +import org.dromara.common.web.core.BaseConverter; +import org.mapstruct.Mapper; + +/** + * 店铺 + * + * @author zcc + */ +@Mapper(componentModel = "spring",uses = BaseConverter.class) +public interface TenantForbiddenConvert extends BaseConverter { +} diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/bo/MemberBankBO.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/bo/MemberBankBO.java new file mode 100644 index 000000000..bf74cf949 --- /dev/null +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/bo/MemberBankBO.java @@ -0,0 +1,37 @@ +package com.wzj.soopin.member.domain.bo; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.wzj.soopin.member.domain.po.MemberBank; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import org.dromara.common.core.domain.BaseBO; + +/** + * 会员银行卡信息 + * + */ +@Schema(description="银行卡") +@Data +public class MemberBankBO extends BaseBO { + + @Schema(description ="ID") + private Long id; + + @Schema(description ="银行名称") + private String name; + + @Schema(description ="银行卡号") + private String code; + + @Schema(description ="开户行") + private String address; + + + @Override + public LambdaQueryWrapper toWrapper() { + return super.toWrapper().eq(id!=null, MemberBank::getId, id) + .like(name!=null, MemberBank::getName, name) + .like(code!=null, MemberBank::getCode, code) + .like(address!=null, MemberBank::getAddress, address); + } +} diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/bo/MemberForbiddenBO.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/bo/MemberForbiddenBO.java new file mode 100644 index 000000000..d00e2be26 --- /dev/null +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/bo/MemberForbiddenBO.java @@ -0,0 +1,54 @@ +package com.wzj.soopin.member.domain.bo; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.wzj.soopin.member.domain.po.MemberBank; +import com.wzj.soopin.member.domain.po.MemberForbidden; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import org.dromara.common.core.domain.BaseBO; + +import java.time.LocalDateTime; + +/** + * 封禁记录 + * + */ +@Schema(description="封禁记录") +@Data +public class MemberForbiddenBO extends BaseBO { + + @Schema(description ="ID") + private Long id; + + @Schema(description ="次数") + private Integer times; + + @Schema(description ="原因") + private Integer reason; + + @Schema(description ="时长") + private Integer duration; + + @Schema(description ="单位") + private Integer unit; + + @Schema(description ="开始时间") + private LocalDateTime startTime; + + + @Schema(description ="结束时间") + private LocalDateTime endTime; + + @Schema(description ="会员id") + private Long memberId; + + @Override + public LambdaQueryWrapper toWrapper() { + return super.toWrapper().eq(id!=null, MemberForbidden::getId, id) + .eq(memberId!=null, MemberForbidden::getMemberId, memberId) + .eq(times!=null, MemberForbidden::getTimes, times) + .eq(reason!=null, MemberForbidden::getReason, reason) + .eq(duration!=null, MemberForbidden::getDuration, duration) + .eq(unit!=null, MemberForbidden::getUnit, unit); + } +} diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/bo/TenantForbiddenBO.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/bo/TenantForbiddenBO.java new file mode 100644 index 000000000..3e1da43cb --- /dev/null +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/bo/TenantForbiddenBO.java @@ -0,0 +1,55 @@ +package com.wzj.soopin.member.domain.bo; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.wzj.soopin.member.domain.po.TenantForbidden; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import org.dromara.common.core.domain.BaseBO; + +import java.time.LocalDateTime; + +/** + * 店铺封禁记录 + */ +@Schema(description = "店铺封禁记录") +@Data +public class TenantForbiddenBO extends BaseBO { + + @Schema(description = "ID") + private Long id; + + @Schema(description = "次数") + private Integer times; + + @Schema(description = "原因") + private Integer reason; + + @Schema(description = "时长") + private Integer duration; + + @Schema(description = "单位") + private Integer unit; + + @Schema(description = "开始时间") + private LocalDateTime startTime; + + + @Schema(description = "结束时间") + private LocalDateTime endTime; + + @Schema(description = "店铺id") + private Long tenantId; + + @Schema(description = "店铺名称") + private String tenantName; + + @Override + public LambdaQueryWrapper toWrapper() { + return super.toWrapper().eq(id != null, TenantForbidden::getId, id) + .eq(tenantId != null, TenantForbidden::getTenantId, tenantId) + .eq(times != null, TenantForbidden::getTimes, times) + .eq(reason != null, TenantForbidden::getReason, reason) + .eq(duration != null, TenantForbidden::getDuration, duration) + .eq(unit != null, TenantForbidden::getUnit, unit); + } +} diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/po/Address.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/po/Address.java index 68b628e93..61e71f29d 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/po/Address.java +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/po/Address.java @@ -14,7 +14,6 @@ import org.dromara.common.excel.annotation.Excel; @Data @TableName("address") public class Address extends BaseAudit { - private static final long serialVersionUID = 1L; @Schema(description ="ID") private Integer id; diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/po/MemberBank.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/po/MemberBank.java new file mode 100644 index 000000000..35aea476b --- /dev/null +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/po/MemberBank.java @@ -0,0 +1,29 @@ +package com.wzj.soopin.member.domain.po; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +/** + * 会员银行卡信息 + * + */ +@Schema(description="银行卡") +@Data +@TableName("ums_member_bank") +public class MemberBank { + + @TableId + private Long id; + + @Schema(description ="银行名称") + private String name; + + @Schema(description ="银行卡号") + private String code; + + @Schema(description ="开户行") + private String address; + +} diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/po/MemberForbidden.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/po/MemberForbidden.java new file mode 100644 index 000000000..9650ecd6d --- /dev/null +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/po/MemberForbidden.java @@ -0,0 +1,36 @@ +package com.wzj.soopin.member.domain.po; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import org.dromara.common.core.domain.model.BaseAudit; + +import java.time.LocalDateTime; + +/** + * 封禁记录 + * + */ +@Schema(description="封禁记录") +@Data +@TableName("ums_forbidden") +public class MemberForbidden extends BaseAudit { + + @TableId + private Long id; + + private Integer times; + + private Integer reason; + + private Integer duration; + + private Integer unit; + + private LocalDateTime startTime; + + private LocalDateTime endTime; + + private Long memberId; +} diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/po/TenantForbidden.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/po/TenantForbidden.java new file mode 100644 index 000000000..335606055 --- /dev/null +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/po/TenantForbidden.java @@ -0,0 +1,38 @@ +package com.wzj.soopin.member.domain.po; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import org.dromara.common.core.domain.model.BaseAudit; + +import java.time.LocalDateTime; + +/** + * 封禁记录 + * + */ +@Schema(description="封禁记录") +@Data +@TableName("ums_tenant_forbidden") +public class TenantForbidden extends BaseAudit { + + @TableId + private Long id; + + private Integer times; + + private Integer reason; + + private Integer duration; + + private Integer unit; + + private LocalDateTime startTime; + + private LocalDateTime endTime; + + private Long tenantId; + + private String tenantName; +} diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/vo/MemberBankVO.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/vo/MemberBankVO.java new file mode 100644 index 000000000..7d59534c8 --- /dev/null +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/vo/MemberBankVO.java @@ -0,0 +1,28 @@ +package com.wzj.soopin.member.domain.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDateTime; + +/** + * 会员银行卡信息 + * + */ +@Schema(description="银行卡") +@Data +public class MemberBankVO { + + @Schema(description ="ID") + private Long id; + + @Schema(description ="银行名称") + private String name; + + @Schema(description ="银行卡号") + private String code; + + @Schema(description ="开户行") + private String address; + +} diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/vo/MemberForbiddenVO.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/vo/MemberForbiddenVO.java new file mode 100644 index 000000000..8d0ced560 --- /dev/null +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/vo/MemberForbiddenVO.java @@ -0,0 +1,44 @@ +package com.wzj.soopin.member.domain.vo; + +import com.wzj.soopin.member.annotation.MemberFillField; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDateTime; + +/** + * 封禁记录 + * + */ +@Schema(description="封禁记录") +@Data +public class MemberForbiddenVO { + + @Schema(description ="ID") + private Long id; + + @Schema(description ="次数") + private Integer times; + + @Schema(description ="原因") + private Integer reason; + + @Schema(description ="时长") + private Integer duration; + + @Schema(description ="单位") + private Integer unit; + + @Schema(description ="开始时间") + private LocalDateTime startTime; + + + @Schema(description ="结束时间") + private LocalDateTime endTime; + + @Schema(description ="会员id") + private Long memberId; + + @MemberFillField(id="memberId") + private MemberVO member; +} diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/vo/TenantForbiddenVO.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/vo/TenantForbiddenVO.java new file mode 100644 index 000000000..f79c29eab --- /dev/null +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/vo/TenantForbiddenVO.java @@ -0,0 +1,46 @@ +package com.wzj.soopin.member.domain.vo; + +import com.wzj.soopin.member.annotation.MemberFillField; +import com.wzj.soopin.member.domain.po.TenantForbidden; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDateTime; + +/** + * 租户封禁记录 + * + */ +@Schema(description="租户封禁记录") +@Data +public class TenantForbiddenVO { + + @Schema(description ="ID") + private Long id; + + @Schema(description ="次数") + private Integer times; + + @Schema(description ="原因") + private Integer reason; + + @Schema(description ="时长") + private Integer duration; + + @Schema(description ="单位") + private Integer unit; + + @Schema(description ="开始时间") + private LocalDateTime startTime; + + + @Schema(description ="结束时间") + private LocalDateTime endTime; + + @Schema(description ="店铺id") + private Long tenantId; + + @Schema(description ="店铺名称") + private String tenantName; + +} diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/mapper/FeedbackMapper.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/mapper/FeedbackMapper.java index c370843f9..12a0506e0 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/mapper/FeedbackMapper.java +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/mapper/FeedbackMapper.java @@ -11,11 +11,5 @@ import java.util.List; * @author zcc */ public interface FeedbackMapper extends BaseMapper { - /** - * 查询意见反馈列表 - * - * @param feedback 意见反馈 - * @return 意见反馈集合 - */ - List selectByEntity(Feedback feedback); + } diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/mapper/MemberAddressMapper.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/mapper/MemberAddressMapper.java index ddabd93b0..e957ac386 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/mapper/MemberAddressMapper.java +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/mapper/MemberAddressMapper.java @@ -11,15 +11,5 @@ import java.util.List; * @author zcc */ public interface MemberAddressMapper extends BaseMapper { - /** - * 查询会员收货地址列表 - * - * @param memberAddress 会员收货地址 - * @return 会员收货地址集合 - */ - List selectByEntity(MemberAddress memberAddress); - int updateByPrimaryKeySelective(MemberAddress address); - - void updateDefault(int IsDefault, Long id); } diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/mapper/MemberBankMapper.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/mapper/MemberBankMapper.java new file mode 100644 index 000000000..b165d6660 --- /dev/null +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/mapper/MemberBankMapper.java @@ -0,0 +1,14 @@ +package com.wzj.soopin.member.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.wzj.soopin.member.domain.po.MemberBank; +import com.wzj.soopin.member.domain.po.MemberForbidden; + +/** + * 用户封禁Mapper接口 + * + * @author zcc + */ +public interface MemberBankMapper extends BaseMapper { + +} diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/mapper/MemberForbiddenMapper.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/mapper/MemberForbiddenMapper.java new file mode 100644 index 000000000..ca0c819c4 --- /dev/null +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/mapper/MemberForbiddenMapper.java @@ -0,0 +1,14 @@ +package com.wzj.soopin.member.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.wzj.soopin.member.domain.po.Feedback; +import com.wzj.soopin.member.domain.po.MemberForbidden; + +/** + * 用户封禁Mapper接口 + * + * @author zcc + */ +public interface MemberForbiddenMapper extends BaseMapper { + +} diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/mapper/TenantForbiddenMapper.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/mapper/TenantForbiddenMapper.java new file mode 100644 index 000000000..0ae644d9e --- /dev/null +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/mapper/TenantForbiddenMapper.java @@ -0,0 +1,13 @@ +package com.wzj.soopin.member.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.wzj.soopin.member.domain.po.TenantForbidden; + +/** + * 租户封禁apper接口 + * + * @author zcc + */ +public interface TenantForbiddenMapper extends BaseMapper { + +} diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/IMemberBankService.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/IMemberBankService.java new file mode 100644 index 000000000..8979f6a9c --- /dev/null +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/IMemberBankService.java @@ -0,0 +1,9 @@ +package com.wzj.soopin.member.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.wzj.soopin.member.domain.po.MemberBank; + +public interface IMemberBankService extends IService { + + +} diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/IMemberForbiddenService.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/IMemberForbiddenService.java new file mode 100644 index 000000000..5caf84f31 --- /dev/null +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/IMemberForbiddenService.java @@ -0,0 +1,13 @@ +package com.wzj.soopin.member.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.wzj.soopin.member.domain.po.Feedback; +import com.wzj.soopin.member.domain.po.MemberForbidden; +import com.wzj.soopin.member.domain.vo.FeedbackVO; + +import java.io.Serializable; + +public interface IMemberForbiddenService extends IService { + + +} diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/ITenantForbiddenService.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/ITenantForbiddenService.java new file mode 100644 index 000000000..f0d1ff02c --- /dev/null +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/ITenantForbiddenService.java @@ -0,0 +1,10 @@ +package com.wzj.soopin.member.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.wzj.soopin.member.domain.po.MemberForbidden; +import com.wzj.soopin.member.domain.po.TenantForbidden; + +public interface ITenantForbiddenService extends IService { + + +} diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/MemberAddressServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/MemberAddressServiceImpl.java index e2103cc0f..cc2d6f051 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/MemberAddressServiceImpl.java +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/MemberAddressServiceImpl.java @@ -1,24 +1,13 @@ package com.wzj.soopin.member.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.wzj.soopin.member.convert.MemberAddressConvert; import com.wzj.soopin.member.domain.po.MemberAddress; -import com.wzj.soopin.member.domain.bo.MemberAddressBO; import com.wzj.soopin.member.mapper.MemberAddressMapper; import com.wzj.soopin.member.service.IMemberAddressService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; -import java.time.LocalDateTime; -import java.util.List; - /** * 会员收货地址Service业务层处理 * @@ -28,65 +17,5 @@ import java.util.List; @RequiredArgsConstructor @Slf4j public class MemberAddressServiceImpl extends ServiceImpl implements IMemberAddressService { - private final MemberAddressConvert memberAddressConvert; - - - /** - * 查询会员收货地址列表 - * - * @param query 查询条件 - * @param page 分页条件 - * @return 会员收货地址 - */ - public IPage selectList(MemberAddressBO query, IPage page) { - - QueryWrapper qw = new QueryWrapper<>(); - String nameLike = query.getName(); - if (!StringUtils.isEmpty(nameLike)) { - qw.like("name", nameLike); - } - String phone = query.getPhone(); -// if (!StringUtils.isEmpty(phone)) { -// qw.eq("phone_encrypted", AesCryptoUtils.encrypt(aesKey, phone)); -// } - String postCode = query.getPostCode(); - if (!StringUtils.isEmpty(postCode)) { - qw.eq("post_code", postCode); - } - String province = query.getProvince(); - if (!StringUtils.isEmpty(province)) { - qw.eq("province", province); - } - String city = query.getCity(); - if (!StringUtils.isEmpty(city)) { - qw.eq("city", city); - } - String district = query.getDistrict(); - if (!StringUtils.isEmpty(district)) { - qw.eq("district", district); - } - String detailAddress = query.getDetailAddress(); - if (!StringUtils.isEmpty(detailAddress)) { - qw.like("detail_address", detailAddress); - } - return baseMapper.selectPage(page,qw); - } - - - - - public Integer deleteUserIds(List ids) { - LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); -// qw.eq(MemberAddress::getMemberId, SecurityUtils.getUserId()); - qw.in(MemberAddress::getId, ids); - return baseMapper.delete(qw); - } - - public MemberAddress selectByUserAndId(Long id) { - LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); -// qw.eq(MemberAddress::getMemberId, SecurityUtils.getUserId()); - qw.eq(MemberAddress::getId, id); - return baseMapper.selectOne(qw); - } } diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/MemberBankServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/MemberBankServiceImpl.java new file mode 100644 index 000000000..5b23921c8 --- /dev/null +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/MemberBankServiceImpl.java @@ -0,0 +1,24 @@ +package com.wzj.soopin.member.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.wzj.soopin.member.domain.po.MemberBank; +import com.wzj.soopin.member.domain.po.TenantForbidden; +import com.wzj.soopin.member.mapper.MemberBankMapper; +import com.wzj.soopin.member.mapper.TenantForbiddenMapper; +import com.wzj.soopin.member.service.IMemberBankService; +import com.wzj.soopin.member.service.ITenantForbiddenService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +/** + * 用户银行卡Service业务层处理 + * + * @author zcc + */ +@Service +@RequiredArgsConstructor +@Slf4j +public class MemberBankServiceImpl extends ServiceImpl implements IMemberBankService { + +} diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/MemberForbiddenServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/MemberForbiddenServiceImpl.java new file mode 100644 index 000000000..a6ed9d9f6 --- /dev/null +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/MemberForbiddenServiceImpl.java @@ -0,0 +1,24 @@ +package com.wzj.soopin.member.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.wzj.soopin.member.domain.po.MemberAddress; +import com.wzj.soopin.member.domain.po.MemberForbidden; +import com.wzj.soopin.member.mapper.MemberAddressMapper; +import com.wzj.soopin.member.mapper.MemberForbiddenMapper; +import com.wzj.soopin.member.service.IMemberAddressService; +import com.wzj.soopin.member.service.IMemberForbiddenService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +/** + * 会员封禁 + * + * @author zcc + */ +@Service +@RequiredArgsConstructor +@Slf4j +public class MemberForbiddenServiceImpl extends ServiceImpl implements IMemberForbiddenService { + +} diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/TenantForbiddenServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/TenantForbiddenServiceImpl.java new file mode 100644 index 000000000..ff3c34670 --- /dev/null +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/TenantForbiddenServiceImpl.java @@ -0,0 +1,21 @@ +package com.wzj.soopin.member.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.wzj.soopin.member.domain.po.TenantForbidden; +import com.wzj.soopin.member.mapper.TenantForbiddenMapper; +import com.wzj.soopin.member.service.ITenantForbiddenService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +/** + * 店铺封禁 + * + * @author zcc + */ +@Service +@RequiredArgsConstructor +@Slf4j +public class TenantForbiddenServiceImpl extends ServiceImpl implements ITenantForbiddenService { + +} diff --git a/ruoyi-modules/ruoyi-member/src/main/resources/ums/MemberAddressMapper.xml b/ruoyi-modules/ruoyi-member/src/main/resources/ums/MemberAddressMapper.xml index f4b1ca5f5..6accdeb46 100644 --- a/ruoyi-modules/ruoyi-member/src/main/resources/ums/MemberAddressMapper.xml +++ b/ruoyi-modules/ruoyi-member/src/main/resources/ums/MemberAddressMapper.xml @@ -4,99 +4,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - - - - - - - - - - - - - - - select id, member_id, name, phone_hidden,phone_encrypted, default_status, post_code, province, city, district, detail_address, is_default, create_by, create_time, update_by, update_time from ums_member_address - - - - - - update ums_member_address - - - member_id = #{memberId, jdbcType=BIGINT}, - - - name = #{name, jdbcType=BIGINT}, - - - phone = #{phone, jdbcType=BIGINT}, - - - default_status = #{defaultStatus, jdbcType=BIGINT}, - - - post_code = #{postCode, jdbcType=BIGINT}, - - - province = #{province, jdbcType=BIGINT}, - - - city = #{city, jdbcType=BIGINT}, - - - district = #{district, jdbcType=BIGINT}, - - - detail_address = #{detailAddress, jdbcType=BIGINT}, - - - is_default = #{isDefault, jdbcType=BIGINT}, - - - create_by = #{createBy, jdbcType=BIGINT}, - - - create_time = #{createTime, jdbcType=BIGINT}, - - - update_by = #{updateBy, jdbcType=BIGINT}, - - - update_time = #{updateTime, jdbcType=BIGINT}, - - - where id = #{id, jdbcType=BIGINT} - - - update ums_member_address - set is_default = #{param1} - where member_id = #{param2} - diff --git a/ruoyi-modules/ruoyi-member/src/main/resources/ums/MemberBankMapper.xml b/ruoyi-modules/ruoyi-member/src/main/resources/ums/MemberBankMapper.xml new file mode 100644 index 000000000..bc87f6c30 --- /dev/null +++ b/ruoyi-modules/ruoyi-member/src/main/resources/ums/MemberBankMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-member/src/main/resources/ums/MemberForbiddenMapper.xml b/ruoyi-modules/ruoyi-member/src/main/resources/ums/MemberForbiddenMapper.xml new file mode 100644 index 000000000..d51f9d1ec --- /dev/null +++ b/ruoyi-modules/ruoyi-member/src/main/resources/ums/MemberForbiddenMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-member/src/main/resources/ums/TenantForbiddenMapper.xml b/ruoyi-modules/ruoyi-member/src/main/resources/ums/TenantForbiddenMapper.xml new file mode 100644 index 000000000..2b80d59f2 --- /dev/null +++ b/ruoyi-modules/ruoyi-member/src/main/resources/ums/TenantForbiddenMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenant.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenant.java index 9800c3075..a91ae124f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenant.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenant.java @@ -8,6 +8,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serial; +import java.time.LocalDateTime; import java.util.Date; /** @@ -100,4 +101,32 @@ public class SysTenant extends BaseEntity { @TableLogic private String delFlag; + + /** + * 营业执照编号 + */ + private String businessLicenseNumber; + + + /** + * 身份证号 + */ + private String idCard; + + + /** + * 银行卡 号 + */ + private String bankCard; + + + /** + * 邀请人 + */ + private Long inviteUserId; + + /** + * 入驻时间 + */ + private LocalDateTime joinTime; } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantVo.java index 6a453150e..ab6bc1947 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantVo.java @@ -1,8 +1,10 @@ package org.dromara.system.domain.vo; +import java.time.LocalDateTime; import java.util.Date; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import org.dromara.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.convert.ExcelDictConvert; import org.dromara.system.domain.SysTenant; @@ -30,86 +32,145 @@ public class SysTenantVo implements Serializable { * id */ @ExcelProperty(value = "id") + @Schema(description = "id") private Long id; /** * 租户编号 */ @ExcelProperty(value = "租户编号") + @Schema(description = "租户编号") private String tenantId; /** * 联系人 */ @ExcelProperty(value = "联系人") + @Schema(description = "联系人") private String contactUserName; /** * 联系电话 */ @ExcelProperty(value = "联系电话") + @Schema(description = "联系电话") private String contactPhone; /** * 企业名称 */ @ExcelProperty(value = "企业名称") + @Schema(description = "企业名称") private String companyName; /** * 统一社会信用代码 */ @ExcelProperty(value = "统一社会信用代码") + @Schema(description = "统一社会信用代码") private String licenseNumber; /** * 地址 */ @ExcelProperty(value = "地址") + @Schema(description = "地址") private String address; /** * 域名 */ @ExcelProperty(value = "域名") + @Schema(description = "域名") private String domain; /** * 企业简介 */ @ExcelProperty(value = "企业简介") + @Schema(description = "企业简介") private String intro; /** * 备注 */ @ExcelProperty(value = "备注") + @Schema(description = "备注") private String remark; /** * 租户套餐编号 */ @ExcelProperty(value = "租户套餐编号") + @Schema(description = "租户套餐编号") private Long packageId; /** * 过期时间 */ @ExcelProperty(value = "过期时间") + @Schema(description = "过期时间") private Date expireTime; /** * 用户数量（-1不限制） */ @ExcelProperty(value = "用户数量") + @Schema(description = "用户数量") private Long accountCount; /** * 租户状态（0正常 1停用） */ @ExcelProperty(value = "租户状态", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "0=正常,1=停用") + @ExcelDictFormat(readConverterExp = "0=正常,1=停用 2 待审核") + @Schema(description = "租户状态") private String status; + /** + * 审核内容 + */ + @ExcelProperty(value = "审核内容") + @Schema(description = "审核内容") + private String auditContent; + + /** + * 营业执照编号 + */ + @Schema(description = "营业执照编号") + @ExcelProperty(value = "营业执照编号") + private String businessLicense; + + + + /** + * 身份证号 + */ + @Schema(description = "身份证号") + @ExcelProperty(value = "身份证号") + private String idCard; + + + /** + * 银行卡号 + */ + @Schema(description = "银行卡号") + @ExcelProperty(value = "银行卡号") + private String bankCard; + + + /** + * 邀请人 + */ + @Schema(description = "邀请人") + @ExcelProperty(value = "邀请人") + private Long inviteUserId; + + /** + * 入驻时间 + */ + @Schema(description = "入驻时间") + @ExcelProperty(value = "入驻时间") + private LocalDateTime joinTime; }