abu/wzj-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/wzj-main' into wzj-main

Browse Source
This commit is contained in:
曹佳豪 2025-06-20 20:13:34 +08:00
commit 52b3be7310
40 changed files with 1007 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ruoyi-admin/src/main/java/org/dromara/web/controller/IndexController.java
View File

@ -25,4 +25,22 @@ public class IndexController {
return StringUtils.format("欢迎使用{}后台管理框架，请通过前端地址访问。", SpringUtils.getApplicationName());
}
/**
* 获取数量统计
*/
// public List< String>
/**
* 获取今日待办任务
*/
/**
* 获取流量概括
*/
/**
* 获取今日概括
*/
}

3
ruoyi-admin/src/main/resources/application.yml
View File

@ -150,6 +150,9 @@ tenant:
- sys_message_user
- ums_fans
- ums_block
- ums_forbidden
- ums_member_bank
- ums_tenant_forbidden
- oms_aftersale
- oms_aftersale_item
- oms_order

41
ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/core/BaseController.java
View File

@ -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<IPage<V>> list(@RequestBody B bo, @RequestBody Page page) {
// IPage<T> 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<Object> 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<Object> remove(@PathVariable Long id) {
// return R.ok(service.removeById(id));
// }
/**
* 响应返回结果
*

26
ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/DarrenController.java Normal file
View File

@ -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 {
}

76
ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberBankController.java Normal file
View File

@ -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<IPage<MemberBankVO>> list(@RequestBody MemberBankBO bo, @RequestBody Page page) {
Page<MemberBank> 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<MemberBankVO> 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<Object> remove(@PathVariable Long id) {
return R.ok(service.removeById(id));
}
}

69
ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberForbiddenController.java Normal file
View File

@ -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<IPage<MemberForbiddenVO>> list(@RequestBody MemberForbiddenBO bo, @RequestBody Page page) {
Page<MemberForbidden> 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<MemberForbiddenVO> 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<Object> remove(@PathVariable Long id) {
return R.ok(service.removeById(id));
}
}

64
ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/TenantForbiddenController.java Normal file
View File

@ -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<IPage<TenantForbiddenVO>> list(@RequestBody TenantForbiddenBO bo, @RequestBody Page page) {
Page<TenantForbidden> 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<TenantForbiddenVO> 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<Object> remove(@PathVariable Long id) {
return R.ok(service.removeById(id));
}
}

7
ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/convert/FansConvert.java
View File

@ -17,11 +17,4 @@ import org.mapstruct.Mapping;
*/
@Mapper(componentModel = "spring",uses = BaseConverter.class)
public interface FansConvert extends BaseConverter<FansVO, FansBO, Fans> {
@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);
}

16
ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/convert/MemberBankConvert.java Normal file
View File

@ -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<MemberBankVO, MemberBankBO, MemberBank> {
}

19
ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/convert/MemberForbiddenConvert.java Normal file
View File

@ -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<MemberForbiddenVO, MemberForbiddenBO, MemberForbidden> {
}

19
ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/convert/TenantForbiddenConvert.java Normal file
View File

@ -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<TenantForbiddenVO, TenantForbiddenBO, TenantForbidden> {
}

37
ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/bo/MemberBankBO.java Normal file
View File

@ -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<MemberBank> {
@Schema(description ="ID")
private Long id;
@Schema(description ="银行名称")
private String name;
@Schema(description ="银行卡号")
private String code;
@Schema(description ="开户行")
private String address;
@Override
public LambdaQueryWrapper<MemberBank> 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);
}
}

54
ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/bo/MemberForbiddenBO.java Normal file
View File

@ -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<MemberForbidden> {
@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<MemberForbidden> 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);
}
}

55
ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/bo/TenantForbiddenBO.java Normal file
View File

@ -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<TenantForbidden> {
@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<TenantForbidden> 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);
}
}

1
ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/po/Address.java
View File

@ -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;

29
ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/po/MemberBank.java Normal file
View File

@ -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;
}

36
ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/po/MemberForbidden.java Normal file
View File

@ -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;
}

38
ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/po/TenantForbidden.java Normal file
View File

@ -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;
}

38
ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/po/Withdraw.java Normal file
View File

@ -0,0 +1,38 @@
package com.wzj.soopin.member.domain.po;
import org.dromara.common.core.domain.model.BaseAudit;
import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
* 提现
*
* @author wzj
* @date 2023-03-07
*/
public class Withdraw extends BaseAudit {
private Long id;
private String code;
private Long memberId;
private BigDecimal money;
private BigDecimal fee;
private BigDecimal actualMoney;
private Integer status;
private Integer type;
private Long auditBy;
private LocalDateTime auditTime;
private Integer method;
private Integer auditStatus;
}

28
ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/vo/MemberBankVO.java Normal file
View File

@ -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;
}

44
ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/vo/MemberForbiddenVO.java Normal file
View File

@ -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;
}

46
ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/vo/TenantForbiddenVO.java Normal file
View File

@ -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;
}

8
ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/mapper/FeedbackMapper.java
View File

@ -11,11 +11,5 @@ import java.util.List;
* @author zcc
*/
public interface FeedbackMapper extends BaseMapper<Feedback> {
/**
* 查询意见反馈列表
*
* @param feedback 意见反馈
* @return 意见反馈集合
*/
List<Feedback> selectByEntity(Feedback feedback);
}

10
ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/mapper/MemberAddressMapper.java
View File

@ -11,15 +11,5 @@ import java.util.List;
* @author zcc
*/
public interface MemberAddressMapper extends BaseMapper<MemberAddress> {
/**
* 查询会员收货地址列表
*
* @param memberAddress 会员收货地址
* @return 会员收货地址集合
*/
List<MemberAddress> selectByEntity(MemberAddress memberAddress);
int updateByPrimaryKeySelective(MemberAddress address);
void updateDefault(int IsDefault, Long id);
}

14
ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/mapper/MemberBankMapper.java Normal file
View File

@ -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<MemberBank> {
}

14
ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/mapper/MemberForbiddenMapper.java Normal file
View File

@ -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<MemberForbidden> {
}

13
ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/mapper/TenantForbiddenMapper.java Normal file
View File

@ -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<TenantForbidden> {
}

9
ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/IMemberBankService.java Normal file
View File

@ -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<MemberBank> {
}

13
ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/IMemberForbiddenService.java Normal file
View File

@ -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<MemberForbidden> {
}

10
ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/ITenantForbiddenService.java Normal file
View File

@ -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<TenantForbidden> {
}

71
ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/MemberAddressServiceImpl.java
View File

@ -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<MemberAddressMapper, MemberAddress> implements IMemberAddressService {
private final MemberAddressConvert memberAddressConvert;
/**
* 查询会员收货地址列表
*
* @param query 查询条件
* @param page 分页条件
* @return 会员收货地址
*/
public IPage<MemberAddress> selectList(MemberAddressBO query, IPage page) {
QueryWrapper<MemberAddress> 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<Long> ids) {
LambdaQueryWrapper<MemberAddress> qw = new LambdaQueryWrapper<>();
// qw.eq(MemberAddress::getMemberId, SecurityUtils.getUserId());
qw.in(MemberAddress::getId, ids);
return baseMapper.delete(qw);
}
public MemberAddress selectByUserAndId(Long id) {
LambdaQueryWrapper<MemberAddress> qw = new LambdaQueryWrapper<>();
// qw.eq(MemberAddress::getMemberId, SecurityUtils.getUserId());
qw.eq(MemberAddress::getId, id);
return baseMapper.selectOne(qw);
}
}

24
ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/MemberBankServiceImpl.java Normal file
View File

@ -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<MemberBankMapper, MemberBank> implements IMemberBankService {
}

24
ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/MemberForbiddenServiceImpl.java Normal file
View File

@ -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<MemberForbiddenMapper, MemberForbidden> implements IMemberForbiddenService {
}

21
ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/TenantForbiddenServiceImpl.java Normal file
View File

@ -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<TenantForbiddenMapper, TenantForbidden> implements ITenantForbiddenService {
}

95
ruoyi-modules/ruoyi-member/src/main/resources/ums/MemberAddressMapper.xml
View File

@ -4,99 +4,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.wzj.soopin.member.mapper.MemberAddressMapper">
<resultMap type="MemberAddress" id="MemberAddressResult">
<result property="id" column="id"/>
<result property="memberId" column="member_id"/>
<result property="name" column="name"/>
<result property="phoneHidden" column="phone_hidden"/>
<result property="phoneEncrypted" column="phone_encrypted"/>
<result property="defaultStatus" column="default_status"/>
<result property="postCode" column="post_code"/>
<result property="province" column="province"/>
<result property="city" column="city"/>
<result property="district" column="district"/>
<result property="detailAddress" column="detail_address"/>
<result property="isDefault" column="is_default"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time" />
</resultMap>
<sql id="selectMemberAddressVo">
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
</sql>
<select id="selectByEntity" parameterType="MemberAddress" resultMap="MemberAddressResult">
<include refid="selectMemberAddressVo"/>
<where>
<if test="memberId != null "> and member_id = #{memberId}</if>
<if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
<if test="defaultStatus != null "> and default_status = #{defaultStatus}</if>
<if test="postCode != null and postCode != ''"> and post_code = #{postCode}</if>
<if test="province != null and province != ''"> and province = #{province}</if>
<if test="city != null and city != ''"> and city = #{city}</if>
<if test="district != null and district != ''"> and district = #{district}</if>
<if test="detailAddress != null and detailAddress != ''"> and detail_address = #{detailAddress}</if>
<if test="isDefault != null "> and is_default = #{isDefault}</if>
</where>
</select>
<update id="updateByPrimaryKeySelective" parameterType="MemberAddress">
update ums_member_address
<set>
<if test="memberId != null">
member_id = #{memberId, jdbcType=BIGINT},
</if>
<if test="name != null">
name = #{name, jdbcType=BIGINT},
</if>
<if test="phone != null">
phone = #{phone, jdbcType=BIGINT},
</if>
<if test="defaultStatus != null">
default_status = #{defaultStatus, jdbcType=BIGINT},
</if>
<if test="postCode != null">
post_code = #{postCode, jdbcType=BIGINT},
</if>
<if test="province != null">
province = #{province, jdbcType=BIGINT},
</if>
<if test="city != null">
city = #{city, jdbcType=BIGINT},
</if>
<if test="district != null">
district = #{district, jdbcType=BIGINT},
</if>
<if test="detailAddress != null">
detail_address = #{detailAddress, jdbcType=BIGINT},
</if>
<if test="isDefault != null">
is_default = #{isDefault, jdbcType=BIGINT},
</if>
<if test="createBy != null">
create_by = #{createBy, jdbcType=BIGINT},
</if>
<if test="createTime != null">
create_time = #{createTime, jdbcType=BIGINT},
</if>
<if test="updateBy != null">
update_by = #{updateBy, jdbcType=BIGINT},
</if>
<if test="updateTime != null">
update_time = #{updateTime, jdbcType=BIGINT},
</if>
</set>
where id = #{id, jdbcType=BIGINT}
</update>
<update id="updateDefault">
update ums_member_address
set is_default = #{param1}
where member_id = #{param2}
</update>
</mapper>

7
ruoyi-modules/ruoyi-member/src/main/resources/ums/MemberBankMapper.xml Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.wzj.soopin.member.mapper.MemberBankMapper">
</mapper>

7
ruoyi-modules/ruoyi-member/src/main/resources/ums/MemberForbiddenMapper.xml Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.wzj.soopin.member.mapper.MemberForbiddenMapper">
</mapper>

7
ruoyi-modules/ruoyi-member/src/main/resources/ums/TenantForbiddenMapper.xml Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.wzj.soopin.member.mapper.TenantForbiddenMapper">
</mapper>

29
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenant.java
View File

@ -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;
}

63
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantVo.java
View File

@ -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;
}