diff --git a/sql/mysql/member.sql b/sql/mysql/member.sql deleted file mode 100644 index 873a6f6..0000000 --- a/sql/mysql/member.sql +++ /dev/null @@ -1,51 +0,0 @@ --- 会员用户表 (tz_member_user) -CREATE TABLE `tz_member_user` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '用户ID', - `mobile` varchar(11) NOT NULL COMMENT '手机', - `password` varchar(128) NOT NULL COMMENT '加密后的密码', - `status` tinyint(4) NOT NULL COMMENT '帐号状态 (枚举 CommonStatusEnum)', - `register_ip` varchar(32) DEFAULT NULL COMMENT '注册 IP', - `register_terminal` tinyint(4) DEFAULT NULL COMMENT '注册终端 (枚举 TerminalEnum)', - `login_ip` varchar(32) DEFAULT NULL COMMENT '最后登录IP', - `login_date` datetime DEFAULT NULL COMMENT '最后登录时间', - `nickname` varchar(64) DEFAULT NULL COMMENT '用户昵称', - `avatar` varchar(512) DEFAULT NULL COMMENT '用户头像', - `name` varchar(64) DEFAULT NULL COMMENT '真实名字', - `sex` tinyint(4) DEFAULT NULL COMMENT '性别 (枚举 SexEnum)', - `birthday` datetime DEFAULT NULL COMMENT '出生日期', - `area_id` int(11) DEFAULT NULL COMMENT '所在地 (关联 Area.id 字段)', - `mark` varchar(512) DEFAULT NULL COMMENT '用户备注', - `point` int(11) DEFAULT NULL COMMENT '积分', - `tag_ids` varchar(512) DEFAULT NULL COMMENT '会员标签列表，以逗号分隔', - `level_id` bigint(20) DEFAULT NULL COMMENT '会员级别编号 (关联 MemberLevelDO.id 字段)', - `experience` int(11) DEFAULT NULL COMMENT '会员经验', - `group_id` bigint(20) DEFAULT NULL COMMENT '用户分组编号 (关联 MemberGroupDO.id 字段)', - `tenant_id` bigint(20) NOT NULL COMMENT '租户ID', - `create_time` datetime NOT NULL COMMENT '创建时间', - `update_time` datetime NOT NULL COMMENT '最后更新时间', - `creator` varchar(64) NOT NULL COMMENT '创建者', - `updater` varchar(64) NOT NULL COMMENT '更新者', - `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否删除', - PRIMARY KEY (`id`), - UNIQUE KEY `uk_mobile` (`mobile`), - KEY `idx_level_id` (`level_id`), - KEY `idx_group_id` (`group_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='会员用户表'; - --- 用户收件地址表 (tz_member_address) -CREATE TABLE `tz_member_address` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '编号', - `user_id` bigint(20) NOT NULL COMMENT '用户编号', - `name` varchar(64) NOT NULL COMMENT '收件人名称', - `mobile` varchar(11) NOT NULL COMMENT '手机号', - `area_id` bigint(20) NOT NULL COMMENT '地区编号', - `detail_address` varchar(512) NOT NULL COMMENT '收件详细地址', - `default_status` tinyint(1) DEFAULT NULL COMMENT '是否默认 (true - 默认收件地址)', - `create_time` datetime NOT NULL COMMENT '创建时间', - `update_time` datetime NOT NULL COMMENT '最后更新时间', - `creator` varchar(64) NOT NULL COMMENT '创建者', - `updater` varchar(64) NOT NULL COMMENT '更新者', - `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否删除', - PRIMARY KEY (`id`), - KEY `idx_user_id` (`user_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用户收件地址表'; \ No newline at end of file diff --git a/sql/mysql/user.sql b/sql/mysql/user.sql new file mode 100644 index 0000000..dffce4b --- /dev/null +++ b/sql/mysql/user.sql @@ -0,0 +1,90 @@ +-- 登录用户表 (tz_login_user) 后续拓展用户信息表 +CREATE TABLE `tz_user_login` +( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '用户ID', + `mobile` varchar(11) NOT NULL COMMENT '手机', + `password` varchar(128) NOT NULL COMMENT '加密后的密码', + `status` tinyint(4) NOT NULL COMMENT '帐号状态 (枚举 CommonStatusEnum)', + `register_ip` varchar(32) DEFAULT NULL COMMENT '注册 IP', + `register_terminal` tinyint(4) DEFAULT NULL COMMENT '注册渠道 (枚举 TerminalEnum)', + `register_date` datetime DEFAULT NULL COMMENT '注册时间', + `login_ip` varchar(32) DEFAULT NULL COMMENT '最后登录IP', + `login_date` datetime DEFAULT NULL COMMENT '最后登录时间', + `login_terminal` varchar(32) DEFAULT NULL COMMENT '最后登录设备', + `nickname` varchar(64) DEFAULT NULL COMMENT '用户昵称', + `avatar` varchar(512) DEFAULT NULL COMMENT '用户头像', + `remark` varchar(512) DEFAULT NULL COMMENT '用户备注', + `tenant_id` bigint(20) NOT NULL COMMENT '租户ID', + `create_time` datetime NOT NULL COMMENT '创建时间', + `update_time` datetime NOT NULL COMMENT '最后更新时间', + `creator` varchar(64) NOT NULL COMMENT '创建者', + `updater` varchar(64) NOT NULL COMMENT '更新者', + `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否删除', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_mobile` (`mobile`) +) ENGINE = InnoDB + DEFAULT CHARSET = utf8mb4 COMMENT ='登录用户表'; + +-- 会员信息表 (tz_user_member) +CREATE TABLE `tz_user_member` +( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '用户ID', + `name` varchar(64) DEFAULT NULL COMMENT '真实名字', + `sex` tinyint DEFAULT NULL COMMENT '性别 (枚举 SexEnum)', + `birthday` datetime DEFAULT NULL COMMENT '出生日期', + `area_id` int DEFAULT NULL COMMENT '所在地 (关联 Area.id 字段)', + `point` int DEFAULT NULL COMMENT '积分', + `tag_ids` varchar(512) DEFAULT NULL COMMENT '会员标签列表，以逗号分隔', + `level_id` bigint DEFAULT NULL COMMENT '会员级别编号 (关联 MemberLevelDO.id 字段)', + `experience` int DEFAULT NULL COMMENT '会员经验', + `group_id` bigint DEFAULT NULL COMMENT '用户分组编号 (关联 MemberGroupDO.id 字段)', + `tenant_id` bigint(20) NOT NULL COMMENT '租户ID', + `create_time` datetime NOT NULL COMMENT '创建时间', + `update_time` datetime NOT NULL COMMENT '最后更新时间', + `creator` varchar(64) NOT NULL COMMENT '创建者', + `updater` varchar(64) NOT NULL COMMENT '更新者', + `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否删除', + PRIMARY KEY (`id`) +) ENGINE = InnoDB + DEFAULT CHARSET = utf8mb4 COMMENT ='会员信息表'; + +-- 会员地址表 (tz_user_member_address) +CREATE TABLE `tz_user_member_address` +( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '用户编号', + `name` varchar(128) DEFAULT NULL COMMENT '收件人名称', + `mobile` varchar(11) DEFAULT NULL COMMENT '手机号', + `areaId` bigint(20) DEFAULT NULL COMMENT '地区编号', + `detailAddress` varchar(255) DEFAULT NULL COMMENT '收件详细地址', + `defaultStatus` int DEFAULT NULL COMMENT '是否默认', + `tenant_id` bigint(20) NOT NULL COMMENT '租户ID', + `create_time` datetime NOT NULL COMMENT '创建时间', + `update_time` datetime NOT NULL COMMENT '最后更新时间', + `creator` varchar(64) NOT NULL COMMENT '创建者', + `updater` varchar(64) NOT NULL COMMENT '更新者', + `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否删除', + PRIMARY KEY (`id`) +) ENGINE = InnoDB + DEFAULT CHARSET = utf8mb4 COMMENT ='会员地址表'; + +-- 会员等级表 (tz_user_member_level) +CREATE TABLE `tz_user_member_level` +( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID', + `level_name` varchar(64) DEFAULT NULL COMMENT '等级名称', + `level` int DEFAULT NULL COMMENT '性别 (枚举 SexEnum)', + `experience` int DEFAULT NULL COMMENT '会员经验', + `discount_percent` int DEFAULT NULL COMMENT '享受折扣', + `icon` varchar(128) DEFAULT NULL COMMENT '等级图标', + `background_url` varchar(128) DEFAULT NULL COMMENT '等级背景图', + `status` int DEFAULT NULL COMMENT '状态', + `tenant_id` bigint(20) NOT NULL COMMENT '租户ID', + `create_time` datetime NOT NULL COMMENT '创建时间', + `update_time` datetime NOT NULL COMMENT '最后更新时间', + `creator` varchar(64) NOT NULL COMMENT '创建者', + `updater` varchar(64) NOT NULL COMMENT '更新者', + `deleted` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否删除', + PRIMARY KEY (`id`) +) ENGINE = InnoDB + DEFAULT CHARSET = utf8mb4 COMMENT ='会员等级表'; + diff --git a/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/ProdApi.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/ProdApi.java index 5e8d79d..919b0ae 100644 --- a/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/ProdApi.java +++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/ProdApi.java @@ -1,9 +1,7 @@ package com.tashow.cloud.productapi.api.product; import com.tashow.cloud.common.pojo.PageResult; -import com.tashow.cloud.productapi.api.product.dto.CategoryDO; import com.tashow.cloud.productapi.api.product.dto.ProdDO; -import com.tashow.cloud.productapi.api.product.dto.ShopDetailDO; import com.tashow.cloud.productapi.api.product.vo.prod.ProdListVO; import com.tashow.cloud.productapi.api.product.vo.prod.ProdPageReqVO; import com.tashow.cloud.productapi.api.product.vo.prod.ProdServiceVO; @@ -12,8 +10,6 @@ import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; -import java.util.List; - @FeignClient(name = ApiConstants.NAME) // TODO 芋艿：fallbackFactory = /** RPC 服务 - 参数配置 */ public interface ProdApi { @@ -26,7 +22,7 @@ public interface ProdApi { * @return 编号 */ - @GetMapping(PREFIX + "/getProdInfo") + @GetMapping(PREFIX + "/getProdInfo1") ProdDO getProdInfo(@RequestParam(value = "id", required = false) Long id); /** diff --git a/tashow-module/pom.xml b/tashow-module/pom.xml index a55637b..fde8e7c 100644 --- a/tashow-module/pom.xml +++ b/tashow-module/pom.xml @@ -18,7 +18,7 @@ tashow-module-ai tashow-module-pay tashow-module-trade - tashow-module-member + tashow-module-user diff --git a/tashow-module/tashow-module-ai/src/main/java/com/tashow/cloud/ai/service/dialog/AiDialogServiceImpl.java b/tashow-module/tashow-module-ai/src/main/java/com/tashow/cloud/ai/service/dialog/AiDialogServiceImpl.java index 1cd2ee0..4703790 100644 --- a/tashow-module/tashow-module-ai/src/main/java/com/tashow/cloud/ai/service/dialog/AiDialogServiceImpl.java +++ b/tashow-module/tashow-module-ai/src/main/java/com/tashow/cloud/ai/service/dialog/AiDialogServiceImpl.java @@ -59,7 +59,6 @@ public class AiDialogServiceImpl extends ServiceImpl "刚刚的音符太独特了，我没听清呢~可以再对我说一次吗？", "哇，这是哪来的小可爱？声音太有魅力了，让我一时走了神。请靠近一点，慢慢再说一遍好？", "背景音有点热闹，我有点分心啦～能在一个更安静的地方，让我专心听听TA的声音吗", - "景音有点热闹，我有点分心啦～能在一个更安静的地方，让我专心听听TA的声音吗", "报告主人！声波受到不明干扰（可能是零食袋的声音？），翻译任务失败，请求二次输入！", "我的‘物种雷达’刚才打了个盹儿~快让我再听一次这美妙的声音！", "这声音太迷人了，让我CPU过载了！请简化一下环境音，我们再来一次？" diff --git a/tashow-module/tashow-module-infra/src/main/resources/codegen/sql/h2.vm b/tashow-module/tashow-module-infra/src/main/resources/codegen/sql/h2.vm index a073fdb..5185597 100644 --- a/tashow-module/tashow-module-infra/src/main/resources/codegen/sql/h2.vm +++ b/tashow-module/tashow-module-infra/src/main/resources/codegen/sql/h2.vm @@ -1,4 +1,4 @@ --- 将该建表 SQL 语句，添加到 yudao-module-${table.moduleName}-biz 模块的 test/resources/sql/create_tables.sql 文件里 +-- 将该建表 SQL 语句，添加到 yudao-module-${table.moduleName}-biz 模块的 test/resources/sql/create_tableslogin.sql 文件里 CREATE TABLE IF NOT EXISTS "${table.tableName.toLowerCase()}" ( #foreach ($column in $columns) #if (${column.javaType} == 'Long') @@ -33,5 +33,5 @@ CREATE TABLE IF NOT EXISTS "${table.tableName.toLowerCase()}" ( PRIMARY KEY ("${primaryColumn.columnName.toLowerCase()}") ) COMMENT '${table.tableComment}'; --- 将该删表 SQL 语句，添加到 yudao-module-${table.moduleName}-biz 模块的 test/resources/sql/clean.sql 文件里 +-- 将该删表 SQL 语句，添加到 yudao-module-${table.moduleName}-biz 模块的 test/resources/sql/cleanlogin.sql 文件里 DELETE FROM "${table.tableName}"; \ No newline at end of file diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/address/MemberAddressApiImpl.java b/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/address/MemberAddressApiImpl.java deleted file mode 100644 index 822c2a8..0000000 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/address/MemberAddressApiImpl.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.tashow.cloud.member.address; - -import com.tashow.cloud.common.pojo.CommonResult; -import com.tashow.cloud.memberapi.api.address.MemberAddressApi; -import com.tashow.cloud.memberapi.api.address.dto.MemberAddressRespDTO; -import com.tashow.cloud.member.convert.address.AddressConvert; -import com.tashow.cloud.member.service.address.AddressService; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.RestController; - -import static com.tashow.cloud.common.pojo.CommonResult.success; - - -/** - * 用户收件地址 API 实现类 - */ -@RestController // 提供 RESTful API 接口，给 Feign 调用 -@Validated -public class MemberAddressApiImpl implements MemberAddressApi { - - @Resource - private AddressService addressService; - - @Override - public CommonResult getAddress(Long id, Long userId) { - return success(AddressConvert.INSTANCE.convert02(addressService.getAddress(userId, id))); - } - - @Override - public CommonResult getDefaultAddress(Long userId) { - return success(AddressConvert.INSTANCE.convert02(addressService.getDefaultUserAddress(userId))); - } - -} diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/admin/address/AddressController.java b/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/admin/address/AddressController.java deleted file mode 100644 index dd69646..0000000 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/admin/address/AddressController.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.tashow.cloud.member.controller.admin.address; - -import com.tashow.cloud.common.pojo.CommonResult; -import com.tashow.cloud.member.controller.admin.address.vo.AddressRespVO; -import com.tashow.cloud.member.convert.address.AddressConvert; -import com.tashow.cloud.member.dal.dataobject.address.MemberAddressDO; -import com.tashow.cloud.member.service.address.AddressService; -import jakarta.annotation.Resource; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -import static com.tashow.cloud.common.pojo.CommonResult.success; - - -// 管理后台 - 用户收件地址 -@RestController -@RequestMapping("/member/address") -@Validated -public class AddressController { - - @Resource - private AddressService addressService; - - @GetMapping("/list") - // 获得用户收件地址列表 - // userId: 用户编号，必填 - @PreAuthorize("@ss.hasPermission('member:user:query')") - public CommonResult> getAddressList(@RequestParam("userId") Long userId) { - List list = addressService.getAddressList(userId); - return success(AddressConvert.INSTANCE.convertList2(list)); - } - -} diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/admin/address/package-info.java b/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/admin/address/package-info.java deleted file mode 100644 index f798caf..0000000 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/admin/address/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package com.tashow.cloud.member.controller.admin.address; diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/admin/address/vo/AddressBaseVO.java b/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/admin/address/vo/AddressBaseVO.java deleted file mode 100644 index ed5e03e..0000000 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/admin/address/vo/AddressBaseVO.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.tashow.cloud.member.controller.admin.address.vo; - -import lombok.*; - -import java.time.LocalDateTime; -import java.util.*; -import jakarta.validation.constraints.*; - -/** - * 用户收件地址 Base VO，提供给添加、修改、详细的子 VO 使用 - * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成 - */ -@Data -public class AddressBaseVO { - - // 收件人名称，必填，示例：张三 - @NotNull(message = "收件人名称不能为空") - private String name; - - // 手机号，必填 - @NotNull(message = "手机号不能为空") - private String mobile; - - // 地区编码，必填，示例：15716 - @NotNull(message = "地区编码不能为空") - private Long areaId; - - // 收件详细地址，必填 - @NotNull(message = "收件详细地址不能为空") - private String detailAddress; - - // 是否默认，必填，示例：2 - @NotNull(message = "是否默认不能为空") - private Boolean defaultStatus; - -} diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/admin/address/vo/AddressRespVO.java b/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/admin/address/vo/AddressRespVO.java deleted file mode 100644 index 8966264..0000000 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/admin/address/vo/AddressRespVO.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.tashow.cloud.member.controller.admin.address.vo; - -import lombok.*; -import java.time.LocalDateTime; - -// 管理后台 - 用户收件地址 Response VO -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class AddressRespVO extends AddressBaseVO { - - // 收件地址编号，必填，示例：7380 - private Long id; - - // 创建时间，必填 - private LocalDateTime createTime; - -} diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/admin/user/vo/MemberUserBaseVO.java b/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/admin/user/vo/MemberUserBaseVO.java deleted file mode 100644 index cacdcf5..0000000 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/admin/user/vo/MemberUserBaseVO.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.tashow.cloud.member.controller.admin.user.vo; - -import lombok.Data; -import org.hibernate.validator.constraints.URL; -import org.springframework.format.annotation.DateTimeFormat; - -import jakarta.validation.constraints.NotNull; -import java.time.LocalDateTime; -import java.util.List; - -import static com.tashow.cloud.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY; - - -/** - * 会员用户 Base VO，提供给添加、修改、详细的子 VO 使用 - * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成 - */ -@Data -public class MemberUserBaseVO { - - // 手机号，必填，示例：15601691300 - @NotNull(message = "手机号不能为空") - private String mobile; - - // 状态，必填，示例：2 - @NotNull(message = "状态不能为空") - private Byte status; - - // 用户昵称，必填，示例：李四 - @NotNull(message = "用户昵称不能为空") - private String nickname; - - // 头像，必填，示例：https://www.iocoder.cn/x.png - @URL(message = "头像必须是 URL 格式") - private String avatar; - - // 用户昵称，示例：李四 - private String name; - - // 用户性别，示例：1 - private Integer sex; - - // 所在地编号，示例：4371 - private Long areaId; - - // 所在地全程，示例：上海上海市普陀区 - private String areaName; - - // 出生日期，示例：2023-03-12 - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY) - private LocalDateTime birthday; - - // 会员备注，示例：我是小备注 - private String mark; - - // 会员标签，示例：[1, 2] - private List tagIds; - - // 会员等级编号，示例：1 - private Long levelId; - - // 用户分组编号，示例：1 - private Long groupId; - -} diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/admin/user/vo/MemberUserPageReqVO.java b/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/admin/user/vo/MemberUserPageReqVO.java deleted file mode 100644 index d4ced7e..0000000 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/admin/user/vo/MemberUserPageReqVO.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.tashow.cloud.member.controller.admin.user.vo; - -import com.tashow.cloud.common.pojo.PageParam; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import org.springframework.format.annotation.DateTimeFormat; - -import java.time.LocalDateTime; -import java.util.List; - -import static com.tashow.cloud.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; - - -// 管理后台 - 会员用户分页 Request VO -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class MemberUserPageReqVO extends PageParam { - - // 手机号，示例：15601691300 - private String mobile; - - // 用户昵称，示例：李四 - private String nickname; - - // 最后登录时间 - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] loginDate; - - // 创建时间 - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] createTime; - - // 会员标签编号列表，示例：[1, 2] - private List tagIds; - - // 会员等级编号，示例：1 - private Long levelId; - - // 用户分组编号，示例：1 - private Long groupId; - - // TODO 芋艿：注册用户类型； - - // TODO 芋艿：登录用户类型； - -} diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/admin/user/vo/MemberUserRespVO.java b/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/admin/user/vo/MemberUserRespVO.java deleted file mode 100644 index 770211e..0000000 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/admin/user/vo/MemberUserRespVO.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.tashow.cloud.member.controller.admin.user.vo; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; - -import java.time.LocalDateTime; -import java.util.List; - -// 管理后台 - 会员用户 Response VO -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class MemberUserRespVO extends MemberUserBaseVO { - - // 编号，必填，示例：23788 - private Long id; - - // 注册 IP，必填，示例：127.0.0.1 - private String registerIp; - - // 最后登录IP，必填，示例：127.0.0.1 - private String loginIp; - - // 最后登录时间，必填 - private LocalDateTime loginDate; - - // 创建时间，必填 - private LocalDateTime createTime; - - // ========== 其它信息 ========== - - // 积分，必填，示例：100 - private Integer point; - - // 总积分，必填，示例：2000 - private Integer totalPoint; - - // 会员标签，示例：[红色, 快乐] - private List tagNames; - - // 会员等级，示例：黄金会员 - private String levelName; - - // 用户分组，示例：购物达人 - private String groupName; - - // 用户经验值，必填，示例：200 - private Integer experience; - -} diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/address/AppAddressController.http b/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/address/AppAddressController.http deleted file mode 100644 index a0582e6..0000000 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/address/AppAddressController.http +++ /dev/null @@ -1,54 +0,0 @@ -### 请求 /create 接口 => 成功 -POST {{appApi}}//member/address/create -Content-Type: application/json -tenant-id: {{appTenantId}} -Authorization: Bearer {{appToken}} - -{ - "name": "yunai", - "mobile": "15601691300", - "areaId": "610632", - "postCode": "200000", - "detailAddress": "芋道源码 233 号 666 室", - "defaulted": true -} - -### 请求 /update 接口 => 成功 -PUT {{appApi}}//member/address/update -Content-Type: application/json -tenant-id: {{appTenantId}} -Authorization: Bearer {{appToken}} - -{ - "id": "1", - "name": "yunai888", - "mobile": "15601691300", - "areaId": "610632", - "postCode": "200000", - "detailAddress": "芋道源码 233 号 666 室", - "defaulted": false -} - -### 请求 /delete 接口 => 成功 -DELETE {{appApi}}//member/address/delete?id=2 -Content-Type: application/json -tenant-id: {{appTenantId}} -Authorization: Bearer {{appToken}} - -### 请求 /get 接口 => 成功 -GET {{appApi}}//member/address/get?id=1 -Content-Type: application/json -tenant-id: {{appTenantId}} -Authorization: Bearer {{appToken}} - -### 请求 /get-default 接口 => 成功 -GET {{appApi}}//member/address/get-default -Content-Type: application/json -tenant-id: {{appTenantId}} -Authorization: Bearer {{appToken}} - -### 请求 /list 接口 => 成功 -GET {{appApi}}//member/address/list -Content-Type: application/json -tenant-id: {{appTenantId}} -Authorization: Bearer {{appToken}} diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/address/AppAddressController.java b/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/address/AppAddressController.java deleted file mode 100644 index 798963b..0000000 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/address/AppAddressController.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.tashow.cloud.member.controller.app.address; - -import com.tashow.cloud.common.pojo.CommonResult; -import com.tashow.cloud.member.controller.app.address.vo.AppAddressCreateReqVO; -import com.tashow.cloud.member.controller.app.address.vo.AppAddressRespVO; -import com.tashow.cloud.member.controller.app.address.vo.AppAddressUpdateReqVO; -import com.tashow.cloud.member.convert.address.AddressConvert; -import com.tashow.cloud.member.dal.dataobject.address.MemberAddressDO; -import com.tashow.cloud.member.service.address.AddressService; -import jakarta.annotation.Resource; -import jakarta.validation.Valid; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -import static com.tashow.cloud.common.pojo.CommonResult.success; -import static com.tashow.cloud.security.security.core.util.SecurityFrameworkUtils.getLoginUserId; - - -/** - * 用户 APP - 用户收件地址 - */ -@RestController -@RequestMapping("/member/address") -@Validated -public class AppAddressController { - - @Resource - private AddressService addressService; - - /** - * 创建用户收件地址 - * @param createReqVO - * @return - */ - @PostMapping("/create") - public CommonResult createAddress(@Valid @RequestBody AppAddressCreateReqVO createReqVO) { - return success(addressService.createAddress(getLoginUserId(), createReqVO)); - } - - /** - * 更新用户收件地址 - * @param updateReqVO - * @return - */ - @PutMapping("/update") - public CommonResult updateAddress(@Valid @RequestBody AppAddressUpdateReqVO updateReqVO) { - addressService.updateAddress(getLoginUserId(), updateReqVO); - return success(true); - } - - /** - * 删除用户收件地址 - * @param id 编号 - * @return - */ - @DeleteMapping("/delete") - public CommonResult deleteAddress(@RequestParam("id") Long id) { - addressService.deleteAddress(getLoginUserId(), id); - return success(true); - } - - /** - * 获得用户收件地址 - * @param id 编号 - * @return - */ - @GetMapping("/get") - public CommonResult getAddress(@RequestParam("id") Long id) { - MemberAddressDO address = addressService.getAddress(getLoginUserId(), id); - return success(AddressConvert.INSTANCE.convert(address)); - } - - /** - * 获得默认的用户收件地址 - * @return - */ - @GetMapping("/get-default") - public CommonResult getDefaultUserAddress() { - MemberAddressDO address = addressService.getDefaultUserAddress(getLoginUserId()); - return success(AddressConvert.INSTANCE.convert(address)); - } - - /** - * 获得用户收件地址列表 - * @return - */ - @GetMapping("/list") - public CommonResult> getAddressList() { - List list = addressService.getAddressList(getLoginUserId()); - return success(AddressConvert.INSTANCE.convertList(list)); - } - -} diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/address/vo/AppAddressBaseVO.java b/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/address/vo/AppAddressBaseVO.java deleted file mode 100644 index 54b1a80..0000000 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/address/vo/AppAddressBaseVO.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.tashow.cloud.member.controller.app.address.vo; -import lombok.Data; - -import jakarta.validation.constraints.NotNull; - -/** -* 用户收件地址 Base VO，提供给添加、修改、详细的子 VO 使用 -*/ -@Data -public class AppAddressBaseVO { - - //收件人名称 - @NotNull(message = "收件人名称不能为空") - private String name; - - //手机号 - @NotNull(message = "手机号不能为空") - private String mobile; - - //地区编号 - @NotNull(message = "地区编号不能为空") - private Long areaId; - - //收件详细地址 - @NotNull(message = "收件详细地址不能为空") - private String detailAddress; - - //是否默认地址 - @NotNull(message = "是否默认地址不能为空") - private Boolean defaultStatus; - -} diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/address/vo/AppAddressCreateReqVO.java b/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/address/vo/AppAddressCreateReqVO.java deleted file mode 100644 index e72746a..0000000 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/address/vo/AppAddressCreateReqVO.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.tashow.cloud.member.controller.app.address.vo; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; - -/** - * 用户 APP - 用户收件地址创建 Request VO - */ -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class AppAddressCreateReqVO extends AppAddressBaseVO { - -} diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/address/vo/AppAddressRespVO.java b/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/address/vo/AppAddressRespVO.java deleted file mode 100644 index af9b187..0000000 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/address/vo/AppAddressRespVO.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.tashow.cloud.member.controller.app.address.vo; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; - -/** - * 用户 APP - 用户收件地址 Response VO - */ -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class AppAddressRespVO extends AppAddressBaseVO { - - //编号 - private Long id; - - //地区名字 - private String areaName; - -} diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/address/vo/AppAddressUpdateReqVO.java b/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/address/vo/AppAddressUpdateReqVO.java deleted file mode 100644 index 07d118e..0000000 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/address/vo/AppAddressUpdateReqVO.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.tashow.cloud.member.controller.app.address.vo; - -import jakarta.validation.constraints.NotNull; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; - -/** - * 用户 APP - 用户收件地址更新 Request VO - */ -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class AppAddressUpdateReqVO extends AppAddressBaseVO { - - //编号 - @NotNull(message = "编号不能为空") - private Long id; - -} diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/convert/address/AddressConvert.java b/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/convert/address/AddressConvert.java deleted file mode 100644 index 23132df..0000000 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/convert/address/AddressConvert.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.tashow.cloud.member.convert.address; - -import com.tashow.cloud.common.util.ip.AreaUtils; -import com.tashow.cloud.memberapi.api.address.dto.MemberAddressRespDTO; -import com.tashow.cloud.member.controller.admin.address.vo.AddressRespVO; -import com.tashow.cloud.member.controller.app.address.vo.AppAddressCreateReqVO; -import com.tashow.cloud.member.controller.app.address.vo.AppAddressRespVO; -import com.tashow.cloud.member.controller.app.address.vo.AppAddressUpdateReqVO; -import com.tashow.cloud.member.dal.dataobject.address.MemberAddressDO; -import org.mapstruct.Mapper; -import org.mapstruct.Mapping; -import org.mapstruct.Named; -import org.mapstruct.factory.Mappers; - -import java.util.List; - -/** - * 用户收件地址 Convert - * - * @author 芋道源码 - */ -@Mapper -public interface AddressConvert { - - AddressConvert INSTANCE = Mappers.getMapper(AddressConvert.class); - - MemberAddressDO convert(AppAddressCreateReqVO bean); - - MemberAddressDO convert(AppAddressUpdateReqVO bean); - - @Mapping(source = "areaId", target = "areaName", qualifiedByName = "convertAreaIdToAreaName") - AppAddressRespVO convert(MemberAddressDO bean); - - List convertList(List list); - - MemberAddressRespDTO convert02(MemberAddressDO bean); - - @Named("convertAreaIdToAreaName") - default String convertAreaIdToAreaName(Integer areaId) { - return AreaUtils.format(areaId); - } - - List convertList2(List list); - -} diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/convert/user/MemberUserConvert.java b/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/convert/user/MemberUserConvert.java deleted file mode 100644 index 7929412..0000000 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/convert/user/MemberUserConvert.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.tashow.cloud.member.convert.user; - -import com.tashow.cloud.common.pojo.PageResult; -import com.tashow.cloud.memberapi.api.user.dto.MemberUserRespDTO; -import com.tashow.cloud.member.controller.admin.user.vo.MemberUserRespVO; -import com.tashow.cloud.member.controller.admin.user.vo.MemberUserUpdateReqVO; -import com.tashow.cloud.member.controller.app.user.vo.AppMemberUserInfoRespVO; -import com.tashow.cloud.member.convert.address.AddressConvert; -import com.tashow.cloud.member.dal.dataobject.user.MemberUserDO; -import org.mapstruct.Mapper; -import org.mapstruct.Mapping; -import org.mapstruct.Mappings; -import org.mapstruct.factory.Mappers; - -import java.util.List; - - -@Mapper(uses = {AddressConvert.class}) -public interface MemberUserConvert { - - MemberUserConvert INSTANCE = Mappers.getMapper(MemberUserConvert.class); - - AppMemberUserInfoRespVO convert(MemberUserDO bean); - - - @Mappings({ - @Mapping(source = "bean.id", target = "id"), - }) - - MemberUserRespDTO convert2(MemberUserDO bean); - - List convertList2(List list); - - MemberUserDO convert(MemberUserUpdateReqVO bean); - - PageResult convertPage(PageResult page); - - @Mapping(source = "areaId", target = "areaName", qualifiedByName = "convertAreaIdToAreaName") - MemberUserRespVO convert03(MemberUserDO bean); - -} diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md b/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md deleted file mode 100644 index 8153487..0000000 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md +++ /dev/null @@ -1 +0,0 @@ - diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/dal/dataobject/user/MemberUserDO.java b/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/dal/dataobject/user/MemberUserDO.java deleted file mode 100644 index c697015..0000000 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/dal/dataobject/user/MemberUserDO.java +++ /dev/null @@ -1,139 +0,0 @@ -package com.tashow.cloud.member.dal.dataobject.user; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.tashow.cloud.common.enums.CommonStatusEnum; -import com.tashow.cloud.common.enums.TerminalEnum; -import com.tashow.cloud.mybatis.mybatis.core.type.LongListTypeHandler; -import com.tashow.cloud.systemapi.enums.common.SexEnum; -import com.tashow.cloud.tenant.core.db.TenantBaseDO; -import lombok.*; -import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; - -import java.time.LocalDateTime; -import java.util.List; - -/** - * 会员用户 DO - * - * uk_mobile 索引：基于 {@link #mobile} 字段 - * - */ -@TableName(value = "member_user", autoResultMap = true) -@Data -@EqualsAndHashCode(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class MemberUserDO extends TenantBaseDO { - - // ========== 账号信息 ========== - - /** - * 用户ID - */ - @TableId - private Long id; - /** - * 手机 - */ - private String mobile; - /** - * 加密后的密码 - * - * 因为目前使用 {@link BCryptPasswordEncoder} 加密器，所以无需自己处理 salt 盐 - */ - private String password; - /** - * 帐号状态 - * - * 枚举 {@link CommonStatusEnum} - */ - private Integer status; - /** - * 注册 IP - */ - private String registerIp; - /** - * 注册终端 - * 枚举 {@link TerminalEnum} - */ - private Integer registerTerminal; - /** - * 最后登录IP - */ - private String loginIp; - /** - * 最后登录时间 - */ - private LocalDateTime loginDate; - - // ========== 基础信息 ========== - - /** - * 用户昵称 - */ - private String nickname; - /** - * 用户头像 - */ - private String avatar; - - /** - * 真实名字 - */ - private String name; - /** - * 性别 - * - * 枚举 {@link SexEnum} - */ - private Integer sex; - /** - * 出生日期 - */ - private LocalDateTime birthday; - /** - * 所在地 - * - * 关联 {@link Area#getId()} 字段 - */ - private Integer areaId; - /** - * 用户备注 - */ - private String mark; - - // ========== 其它信息 ========== - - /** - * 积分 - */ - private Integer point; - // TODO 疯狂：增加一个 totalPoint；个人信息接口要返回 - - /** - * 会员标签列表，以逗号分隔 - */ - @TableField(typeHandler = LongListTypeHandler.class) - private List tagIds; - - /** - * 会员级别编号 - * - * 关联 {@link MemberLevelDO#getId()} 字段 - */ - private Long levelId; - /** - * 会员经验 - */ - private Integer experience; - /** - * 用户分组编号 - * - * 关联 {@link MemberGroupDO#getId()} 字段 - */ - private Long groupId; - -} diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/dal/mysql/address/MemberAddressMapper.java b/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/dal/mysql/address/MemberAddressMapper.java deleted file mode 100644 index fb6910e..0000000 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/dal/mysql/address/MemberAddressMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.tashow.cloud.member.dal.mysql.address; - -import com.tashow.cloud.member.dal.dataobject.address.MemberAddressDO; -import com.tashow.cloud.mybatis.mybatis.core.mapper.BaseMapperX; -import com.tashow.cloud.mybatis.mybatis.core.query.LambdaQueryWrapperX; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -@Mapper -public interface MemberAddressMapper extends BaseMapperX { - - default MemberAddressDO selectByIdAndUserId(Long id, Long userId) { - return selectOne(MemberAddressDO::getId, id, MemberAddressDO::getUserId, userId); - } - - default List selectListByUserIdAndDefaulted(Long userId, Boolean defaulted) { - return selectList(new LambdaQueryWrapperX().eq(MemberAddressDO::getUserId, userId) - .eqIfPresent(MemberAddressDO::getDefaultStatus, defaulted)); - } - -} diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/dal/mysql/user/MemberUserMapper.java b/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/dal/mysql/user/MemberUserMapper.java deleted file mode 100644 index d3de5ae..0000000 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/dal/mysql/user/MemberUserMapper.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.tashow.cloud.member.dal.mysql.user; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.lang.Assert; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.tashow.cloud.common.pojo.PageResult; -import com.tashow.cloud.member.controller.admin.user.vo.MemberUserPageReqVO; -import com.tashow.cloud.member.dal.dataobject.user.MemberUserDO; -import com.tashow.cloud.mybatis.mybatis.core.mapper.BaseMapperX; -import com.tashow.cloud.mybatis.mybatis.core.query.LambdaQueryWrapperX; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; -import java.util.stream.Collectors; - -/** - * 会员 User Mapper - * - * @author 芋道源码 - */ -@Mapper -public interface MemberUserMapper extends BaseMapperX { - - default MemberUserDO selectByMobile(String mobile) { - return selectOne(MemberUserDO::getMobile, mobile); - } - - default List selectListByNicknameLike(String nickname) { - return selectList(new LambdaQueryWrapperX() - .likeIfPresent(MemberUserDO::getNickname, nickname)); - } - - default PageResult selectPage(MemberUserPageReqVO reqVO) { - // 处理 tagIds 过滤条件 - String tagIdSql = ""; - if (CollUtil.isNotEmpty(reqVO.getTagIds())) { - tagIdSql = reqVO.getTagIds().stream() - .map(tagId -> "FIND_IN_SET(" + tagId + ", tag_ids)") - .collect(Collectors.joining(" OR ")); - } - // 分页查询 - return selectPage(reqVO, new LambdaQueryWrapperX() - .likeIfPresent(MemberUserDO::getMobile, reqVO.getMobile()) - .betweenIfPresent(MemberUserDO::getLoginDate, reqVO.getLoginDate()) - .likeIfPresent(MemberUserDO::getNickname, reqVO.getNickname()) - .betweenIfPresent(MemberUserDO::getCreateTime, reqVO.getCreateTime()) - .eqIfPresent(MemberUserDO::getLevelId, reqVO.getLevelId()) - .eqIfPresent(MemberUserDO::getGroupId, reqVO.getGroupId()) - .apply(StrUtil.isNotEmpty(tagIdSql), tagIdSql) - .orderByDesc(MemberUserDO::getId)); - } - - default Long selectCountByGroupId(Long groupId) { - return selectCount(MemberUserDO::getGroupId, groupId); - } - - default Long selectCountByLevelId(Long levelId) { - return selectCount(MemberUserDO::getLevelId, levelId); - } - - default Long selectCountByTagId(Long tagId) { - return selectCount(new LambdaQueryWrapperX() - .apply("FIND_IN_SET({0}, tag_ids)", tagId)); - } - - /** - * 更新用户积分（增加） - * - * @param id 用户编号 - * @param incrCount 增加积分（正数） - */ - default void updatePointIncr(Long id, Integer incrCount) { - Assert.isTrue(incrCount > 0); - LambdaUpdateWrapper lambdaUpdateWrapper = new LambdaUpdateWrapper() - .setSql(" point = point + " + incrCount) - .eq(MemberUserDO::getId, id); - update(null, lambdaUpdateWrapper); - } - - /** - * 更新用户积分（减少） - * - * @param id 用户编号 - * @param incrCount 增加积分（负数） - * @return 更新行数 - */ - default int updatePointDecr(Long id, Integer incrCount) { - Assert.isTrue(incrCount < 0); - LambdaUpdateWrapper lambdaUpdateWrapper = new LambdaUpdateWrapper() - .setSql(" point = point + " + incrCount) // 负数，所以使用 + 号 - .eq(MemberUserDO::getId, id); - return update(null, lambdaUpdateWrapper); - } - -} diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/framework/rpc/package-info.java b/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/framework/rpc/package-info.java deleted file mode 100644 index 8061aa6..0000000 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/framework/rpc/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 占位 - */ -package com.tashow.cloud.member.framework.rpc; diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/framework/security/core/package-info.java b/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/framework/security/core/package-info.java deleted file mode 100644 index f049497..0000000 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/framework/security/core/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 占位 - */ -package com.tashow.cloud.member.framework.security.core; diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/mq/consumer/package-info.java b/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/mq/consumer/package-info.java deleted file mode 100644 index 08f2a13..0000000 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/mq/consumer/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 消息队列的消费者 - */ -package com.tashow.cloud.member.mq.consumer; diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/mq/message/package-info.java b/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/mq/message/package-info.java deleted file mode 100644 index e76e5ad..0000000 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/mq/message/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 消息队列的消息 - */ -package com.tashow.cloud.member.mq.message; diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/mq/producer/package-info.java b/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/mq/producer/package-info.java deleted file mode 100644 index c38d756..0000000 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/mq/producer/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 消息队列的生产者 - */ -package com.tashow.cloud.member.mq.producer; diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/mq/producer/user/MemberUserProducer.java b/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/mq/producer/user/MemberUserProducer.java deleted file mode 100644 index ae43c1c..0000000 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/mq/producer/user/MemberUserProducer.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.tashow.cloud.member.mq.producer.user; - -import com.tashow.cloud.memberapi.message.user.MemberUserCreateMessage; -import lombok.extern.slf4j.Slf4j; -import org.springframework.context.ApplicationContext; -import org.springframework.stereotype.Component; - -import jakarta.annotation.Resource; - -/** - * 会员用户 Producer - * - * @author owen - */ -@Slf4j -@Component -public class MemberUserProducer { - - @Resource - private ApplicationContext applicationContext; - - /** - * 发送 {@link MemberUserCreateMessage} 消息 - * - * @param userId 用户编号 - */ - public void sendUserCreateMessage(Long userId) { - applicationContext.publishEvent(new MemberUserCreateMessage().setUserId(userId)); - } - -} diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/package-info.java b/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/package-info.java deleted file mode 100644 index 4ed8d94..0000000 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -/** - * member 模块，我们放会员业务。 - * 例如说：会员中心等等 - * - * 1. Controller URL：以 /member/ 开头，避免和其它 Module 冲突 - * 2. DataObject 表名：以 member_ 开头，方便在数据库中区分 - */ -package com.tashow.cloud.member; diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/service/address/AddressService.java b/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/service/address/AddressService.java deleted file mode 100644 index cbd2236..0000000 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/service/address/AddressService.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.tashow.cloud.member.service.address; - -import com.tashow.cloud.member.controller.app.address.vo.AppAddressCreateReqVO; -import com.tashow.cloud.member.controller.app.address.vo.AppAddressUpdateReqVO; -import com.tashow.cloud.member.dal.dataobject.address.MemberAddressDO; - -import jakarta.validation.Valid; -import java.util.List; - -/** - * 用户收件地址 Service 接口 - * - * @author 芋道源码 - */ -public interface AddressService { - - /** - * 创建用户收件地址 - * - * - * @param userId 用户编号 - * @param createReqVO 创建信息 - * @return 编号 - */ - Long createAddress(Long userId, @Valid AppAddressCreateReqVO createReqVO); - - /** - * 更新用户收件地址 - * - * @param userId 用户编号 - * @param updateReqVO 更新信息 - */ - void updateAddress(Long userId, @Valid AppAddressUpdateReqVO updateReqVO); - - /** - * 删除用户收件地址 - * - * @param userId 用户编号 - * @param id 编号 - */ - void deleteAddress(Long userId, Long id); - - /** - * 获得用户收件地址 - * - * @param id 编号 - * @return 用户收件地址 - */ - MemberAddressDO getAddress(Long userId, Long id); - - /** - * 获得用户收件地址列表 - * - * @param userId 用户编号 - * @return 用户收件地址列表 - */ - List getAddressList(Long userId); - - /** - * 获得用户默认的收件地址 - * - * @param userId 用户编号 - * @return 用户收件地址 - */ - MemberAddressDO getDefaultUserAddress(Long userId); - -} diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/service/address/AddressServiceImpl.java b/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/service/address/AddressServiceImpl.java deleted file mode 100644 index a5893c2..0000000 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/service/address/AddressServiceImpl.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.tashow.cloud.member.service.address; - -import cn.hutool.core.collection.CollUtil; -import com.tashow.cloud.member.controller.app.address.vo.AppAddressCreateReqVO; -import com.tashow.cloud.member.controller.app.address.vo.AppAddressUpdateReqVO; -import com.tashow.cloud.member.convert.address.AddressConvert; -import com.tashow.cloud.member.dal.dataobject.address.MemberAddressDO; -import com.tashow.cloud.member.dal.mysql.address.MemberAddressMapper; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.validation.annotation.Validated; - -import jakarta.annotation.Resource; -import java.util.List; - -import static com.tashow.cloud.common.exception.util.ServiceExceptionUtil.exception; -import static com.tashow.cloud.memberapi.enums.ErrorCodeConstants.ADDRESS_NOT_EXISTS; - -/** - * 用户收件地址 Service 实现类 - * - * @author 芋道源码 - */ -@Service -@Validated -public class AddressServiceImpl implements AddressService { - - @Resource - private MemberAddressMapper memberAddressMapper; - - @Override - @Transactional(rollbackFor = Exception.class) - public Long createAddress(Long userId, AppAddressCreateReqVO createReqVO) { - // 如果添加的是默认收件地址，则将原默认地址修改为非默认 - if (Boolean.TRUE.equals(createReqVO.getDefaultStatus())) { - List addresses = memberAddressMapper.selectListByUserIdAndDefaulted(userId, true); - addresses.forEach(address -> memberAddressMapper.updateById(new MemberAddressDO().setId(address.getId()).setDefaultStatus(false))); - } - - // 插入 - MemberAddressDO address = AddressConvert.INSTANCE.convert(createReqVO); - address.setUserId(userId); - memberAddressMapper.insert(address); - // 返回 - return address.getId(); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void updateAddress(Long userId, AppAddressUpdateReqVO updateReqVO) { - // 校验存在,校验是否能够操作 - validAddressExists(userId, updateReqVO.getId()); - - // 如果修改的是默认收件地址，则将原默认地址修改为非默认 - if (Boolean.TRUE.equals(updateReqVO.getDefaultStatus())) { - List addresses = memberAddressMapper.selectListByUserIdAndDefaulted(userId, true); - addresses.stream().filter(u -> !u.getId().equals(updateReqVO.getId())) // 排除自己 - .forEach(address -> memberAddressMapper.updateById(new MemberAddressDO().setId(address.getId()).setDefaultStatus(false))); - } - - // 更新 - MemberAddressDO updateObj = AddressConvert.INSTANCE.convert(updateReqVO); - memberAddressMapper.updateById(updateObj); - } - - @Override - public void deleteAddress(Long userId, Long id) { - // 校验存在,校验是否能够操作 - validAddressExists(userId, id); - // 删除 - memberAddressMapper.deleteById(id); - } - - private void validAddressExists(Long userId, Long id) { - MemberAddressDO addressDO = getAddress(userId, id); - if (addressDO == null) { - throw exception(ADDRESS_NOT_EXISTS); - } - } - - @Override - public MemberAddressDO getAddress(Long userId, Long id) { - return memberAddressMapper.selectByIdAndUserId(id, userId); - } - - @Override - public List getAddressList(Long userId) { - return memberAddressMapper.selectListByUserIdAndDefaulted(userId, null); - } - - @Override - public MemberAddressDO getDefaultUserAddress(Long userId) { - List addresses = memberAddressMapper.selectListByUserIdAndDefaulted(userId, true); - return CollUtil.getFirst(addresses); - } - -} diff --git a/tashow-module/tashow-module-member/src/test/resources/application-unit-test.yaml b/tashow-module/tashow-module-member/src/test/resources/application-unit-test.yaml deleted file mode 100644 index c1f6573..0000000 --- a/tashow-module/tashow-module-member/src/test/resources/application-unit-test.yaml +++ /dev/null @@ -1,48 +0,0 @@ -spring: - main: - lazy-initialization: true # 开启懒加载，加快速度 - banner-mode: off # 单元测试，禁用 Banner - ---- #################### 数据库相关配置 #################### - -spring: - # 数据源配置项 - datasource: - name: ruoyi-vue-pro - url: jdbc:h2:mem:testdb;MODE=MYSQL;DATABASE_TO_UPPER=false;NON_KEYWORDS=value; # MODE 使用 MySQL 模式；DATABASE_TO_UPPER 配置表和字段使用小写 - driver-class-name: org.h2.Driver - username: sa - password: - druid: - async-init: true # 单元测试，异步初始化 Druid 连接池，提升启动速度 - initial-size: 1 # 单元测试，配置为 1，提升启动速度 - sql: - init: - schema-locations: classpath:/sql/create_tables.sql - - # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优 - data: - redis: - host: 127.0.0.1 # 地址 - port: 16379 # 端口（单元测试，使用 16379 端口） - database: 0 # 数据库索引 - -mybatis: - lazy-initialization: true # 单元测试，设置 MyBatis Mapper 延迟加载，加速每个单元测试 - ---- #################### 定时任务相关配置 #################### - ---- #################### 配置中心相关配置 #################### - ---- #################### 服务保障相关配置 #################### - -# Lock4j 配置项（单元测试，禁用 Lock4j） - ---- #################### 监控相关配置 #################### - ---- #################### 芋道相关配置 #################### - -# 芋道配置项，设置当前项目所有自定义的配置 -yudao: - info: - base-package: cn.iocoder.yudao.module diff --git a/tashow-module/tashow-module-member/src/test/resources/logback.xml b/tashow-module/tashow-module-member/src/test/resources/logback.xml deleted file mode 100644 index daf756b..0000000 --- a/tashow-module/tashow-module-member/src/test/resources/logback.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/tashow-module/tashow-module-member/src/test/resources/sql/clean.sql b/tashow-module/tashow-module-member/src/test/resources/sql/clean.sql deleted file mode 100644 index f972e04..0000000 --- a/tashow-module/tashow-module-member/src/test/resources/sql/clean.sql +++ /dev/null @@ -1,5 +0,0 @@ -DELETE FROM "member_user"; -DELETE FROM "member_address"; -DELETE FROM "member_tag"; -DELETE FROM "member_level"; -DELETE FROM "member_group"; \ No newline at end of file diff --git a/tashow-module/tashow-module-member/src/test/resources/sql/create_tables.sql b/tashow-module/tashow-module-member/src/test/resources/sql/create_tables.sql deleted file mode 100644 index 782a818..0000000 --- a/tashow-module/tashow-module-member/src/test/resources/sql/create_tables.sql +++ /dev/null @@ -1,113 +0,0 @@ -CREATE TABLE IF NOT EXISTS "member_user" -( - "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY COMMENT '编号', - "nickname" varchar(30) NOT NULL DEFAULT '' COMMENT '用户昵称', - "name" varchar(30) NULL COMMENT '真实名字', - sex tinyint null comment '性别', - birthday datetime null comment '出生日期', - area_id int null comment '所在地', - mark varchar(255) null comment '用户备注', - point int default 0 null comment '积分', - "avatar" varchar(255) NOT NULL DEFAULT '' COMMENT '头像', - "status" tinyint NOT NULL COMMENT '状态', - "mobile" varchar(11) NOT NULL COMMENT '手机号', - "password" varchar(100) NOT NULL DEFAULT '' COMMENT '密码', - "register_ip" varchar(32) NOT NULL COMMENT '注册 IP', - "login_ip" varchar(50) NULL DEFAULT '' COMMENT '最后登录IP', - "login_date" datetime NULL DEFAULT NULL COMMENT '最后登录时间', - "tag_ids" varchar(255) NULL DEFAULT NULL COMMENT '用户标签编号列表,以逗号分隔', - "level_id" bigint NULL DEFAULT NULL COMMENT '等级编号', - "experience" bigint NULL DEFAULT NULL COMMENT '经验', - "group_id" bigint NULL DEFAULT NULL COMMENT '用户分组编号', - "creator" varchar(64) NULL DEFAULT '' COMMENT '创建者', - "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - "updater" varchar(64) NULL DEFAULT '' COMMENT '更新者', - "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', - "deleted" bit(1) NOT NULL DEFAULT '0' COMMENT '是否删除', - "tenant_id" bigint not null default '0', - PRIMARY KEY ("id") -) COMMENT '会员表'; - -CREATE TABLE IF NOT EXISTS "member_address" ( - "id" bigint(20) NOT NULL GENERATED BY DEFAULT AS IDENTITY, - "user_id" bigint(20) NOT NULL, - "name" varchar(10) NOT NULL, - "mobile" varchar(20) NOT NULL, - "area_id" bigint(20) NOT NULL, - "detail_address" varchar(250) NOT NULL, - "default_status" bit NOT NULL, - "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, - "creator" varchar(64) DEFAULT '', - "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - "deleted" bit NOT NULL DEFAULT FALSE, - "updater" varchar(64) DEFAULT '', - PRIMARY KEY ("id") -) COMMENT '用户收件地址'; - -CREATE TABLE IF NOT EXISTS "member_tag" -( - "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY, - "name" varchar NOT NULL, - "creator" varchar DEFAULT '', - "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, - "updater" varchar DEFAULT '', - "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - "deleted" bit NOT NULL DEFAULT FALSE, - "tenant_id" bigint NOT NULL default '0', - PRIMARY KEY ("id") -) COMMENT '会员标签'; - -CREATE TABLE IF NOT EXISTS "member_level" -( - "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY, - "name" varchar NOT NULL, - "experience" int NOT NULL, - "level" int NOT NULL, - "discount_percent" int NOT NULL, - "icon" varchar NOT NULL, - "background_url" varchar NOT NULL, - "creator" varchar DEFAULT '', - "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, - "updater" varchar DEFAULT '', - "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - "deleted" bit NOT NULL DEFAULT FALSE, - "tenant_id" bigint not null default '0', - "status" tinyint NOT NULL DEFAULT '0', - PRIMARY KEY ("id") -) COMMENT '会员等级'; - -CREATE TABLE IF NOT EXISTS "member_group" -( - "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY, - "name" varchar NOT NULL, - "remark" varchar NOT NULL, - "status" tinyint NOT NULL DEFAULT '0', - "creator" varchar DEFAULT '', - "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, - "updater" varchar DEFAULT '', - "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - "deleted" bit NOT NULL DEFAULT FALSE, - "tenant_id" bigint not null default '0', - PRIMARY KEY ("id") -) COMMENT '用户分组'; -CREATE TABLE IF NOT EXISTS "member_brokerage_record" -( - "id" int NOT NULL GENERATED BY DEFAULT AS IDENTITY, - "user_id" bigint NOT NULL, - "biz_id" varchar NOT NULL, - "biz_type" varchar NOT NULL, - "title" varchar NOT NULL, - "price" int NOT NULL, - "total_price" int NOT NULL, - "description" varchar NOT NULL, - "status" varchar NOT NULL, - "frozen_days" int NOT NULL, - "unfreeze_time" varchar, - "creator" varchar DEFAULT '', - "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, - "updater" varchar DEFAULT '', - "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - "deleted" bit NOT NULL DEFAULT FALSE, - "tenant_id" bigint not null default '0', - PRIMARY KEY ("id") -) COMMENT '佣金记录'; diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdController.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdController.java index fbdf2a4..f68a7c4 100644 --- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdController.java +++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdController.java @@ -3,12 +3,9 @@ package com.tashow.cloud.product.controller.admin; import com.tashow.cloud.common.pojo.CommonResult; import com.tashow.cloud.common.pojo.PageResult; import com.tashow.cloud.product.mapper.ProdMapper; -import com.tashow.cloud.productapi.api.product.dto.ProdDO; import com.tashow.cloud.product.service.ProdService; -import com.tashow.cloud.productapi.api.product.dto.SkuDO; +import com.tashow.cloud.productapi.api.product.dto.ProdDO; import com.tashow.cloud.productapi.api.product.vo.prod.*; -import com.tashow.cloud.productapi.api.product.vo.sku.SkuPageReqVO; -import com.tashow.cloud.productapi.api.product.vo.sku.SkuRecycleBinVO; import com.tashow.cloud.productapi.enums.BaseEnum; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -124,6 +121,7 @@ public class ProdController { @GetMapping("/getProdInfo") @Operation(summary = "获得商品详情a") @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PermitAll public CommonResult getProdInfo(@RequestParam("id") Long id) { ProdDO prod = prodService.getProd(id); return success(prod); diff --git a/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/controller/admin/order/TradeOrderController.java b/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/controller/admin/order/TradeOrderController.java index 4fcd38f..ce08b37 100644 --- a/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/controller/admin/order/TradeOrderController.java +++ b/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/controller/admin/order/TradeOrderController.java @@ -159,7 +159,7 @@ public class TradeOrderController { @GetMapping("/fastPhoto") @PermitAll // @PreAuthorize("@ss.hasPermission('trade:order:query')") - public CommonResult fastPhoto(TradeOrderFastPhotoReqVo reqVo) { + public CommonResult fastPhoto(@Valid TradeOrderFastPhotoReqVo reqVo) { //获取交易订单详情 TradeOrderItemDO orderItem = tradeOrderQueryService.getOrderItem(reqVo.getItemId()); //获取产品详情 @@ -175,10 +175,10 @@ public class TradeOrderController { @GetMapping("/subTimeLog/{id}") @PermitAll // @PreAuthorize("@ss.hasPermission('trade:order:query')") - public CommonResult subTimeLog(@PathVariable("id") Long id) { + public CommonResult> subTimeLog(@PathVariable("id") Long id) { //获取订单预约时间修改列表 List subLogDO = tradeOrderQueryService.getSubTimeLogList(id); - return success(TradeOrderConvert.INSTANCE.convertToSubTimeList(subLogDO)); + return success(subLogDO); } } diff --git a/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/controller/admin/order/vo/TradeOrderFastPhotoReqVo.java b/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/controller/admin/order/vo/TradeOrderFastPhotoReqVo.java index 71a03db..7bc7905 100644 --- a/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/controller/admin/order/vo/TradeOrderFastPhotoReqVo.java +++ b/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/controller/admin/order/vo/TradeOrderFastPhotoReqVo.java @@ -1,12 +1,15 @@ package com.tashow.cloud.trade.controller.admin.order.vo; +import jakarta.validation.constraints.NotNull; import lombok.Data; @Data public class TradeOrderFastPhotoReqVo { //订单项id + @NotNull(message = "订单详情编号不能为空") private Long itemId; //产品id + @NotNull(message = "产品编号不能为空") private Long spuId; } diff --git a/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/controller/admin/order/vo/TradeOrderSubTimeListRespVo.java b/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/controller/admin/order/vo/TradeOrderSubTimeListRespVo.java index 80e73e7..bf5abaa 100644 --- a/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/controller/admin/order/vo/TradeOrderSubTimeListRespVo.java +++ b/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/controller/admin/order/vo/TradeOrderSubTimeListRespVo.java @@ -1,9 +1,11 @@ package com.tashow.cloud.trade.controller.admin.order.vo; import com.tashow.cloud.trade.dal.dataobject.order.TradeOrderSubLogDO; +import lombok.Data; import java.util.List; +@Data public class TradeOrderSubTimeListRespVo { private List subTimeList; diff --git a/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/convert/order/TradeOrderConvert.java b/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/convert/order/TradeOrderConvert.java index 9b5d233..1b21bbe 100644 --- a/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/convert/order/TradeOrderConvert.java +++ b/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/convert/order/TradeOrderConvert.java @@ -14,6 +14,7 @@ import com.tashow.cloud.memberapi.api.user.dto.MemberUserRespDTO; import com.tashow.cloud.payapi.api.order.dto.PayOrderCreateReqDTO; import com.tashow.cloud.payapi.enums.DictTypeConstants; import com.tashow.cloud.productapi.api.product.dto.ProdDO; +import com.tashow.cloud.productapi.api.product.vo.prod.ProdRespVO; import com.tashow.cloud.trade.controller.admin.base.member.user.MemberUserRespVO; import com.tashow.cloud.trade.controller.admin.order.vo.*; import com.tashow.cloud.trade.controller.app.order.vo.*; @@ -26,7 +27,6 @@ import com.tashow.cloud.trade.dal.dataobject.delivery.DeliveryExpressDO; import com.tashow.cloud.trade.dal.dataobject.order.TradeOrderDO; import com.tashow.cloud.trade.dal.dataobject.order.TradeOrderItemDO; import com.tashow.cloud.trade.dal.dataobject.order.TradeOrderLogDO; -import com.tashow.cloud.trade.dal.dataobject.order.TradeOrderSubLogDO; import com.tashow.cloud.trade.framework.delivery.core.client.dto.ExpressTrackRespDTO; import com.tashow.cloud.trade.framework.order.config.TradeOrderProperties; import com.tashow.cloud.trade.service.brokerage.bo.BrokerageAddReqBO; @@ -120,10 +120,6 @@ public interface TradeOrderConvert { TradeOrderFastPhotoRespVo convert(TradeOrderItemDO itemDO, ProdDO prodDO); //endregion - //region 订单预约时间修改列表 - TradeOrderSubTimeListRespVo convertToSubTimeList(List subTimeList); - //endregion - @Mappings({ @Mapping(target = "id", ignore = true), diff --git a/tashow-module/tashow-module-member/Dockerfile b/tashow-module/tashow-module-user/Dockerfile similarity index 100% rename from tashow-module/tashow-module-member/Dockerfile rename to tashow-module/tashow-module-user/Dockerfile diff --git a/tashow-module/tashow-module-member/pom.xml b/tashow-module/tashow-module-user/pom.xml similarity index 98% rename from tashow-module/tashow-module-member/pom.xml rename to tashow-module/tashow-module-user/pom.xml index 15d851d..21a2b76 100644 --- a/tashow-module/tashow-module-member/pom.xml +++ b/tashow-module/tashow-module-user/pom.xml @@ -8,7 +8,7 @@ ${revision} 4.0.0 - tashow-module-member + tashow-module-user jar ${project.artifactId} diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/MemberServerApplication.java b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/UserServerApplication.java similarity index 62% rename from tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/MemberServerApplication.java rename to tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/UserServerApplication.java index d9f285e..25664bc 100644 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/MemberServerApplication.java +++ b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/UserServerApplication.java @@ -1,4 +1,4 @@ -package com.tashow.cloud.member; +package com.tashow.cloud.user; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -7,10 +7,10 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; * 项目的启动类 */ @SpringBootApplication -public class MemberServerApplication { +public class UserServerApplication { public static void main(String[] args) { - SpringApplication.run(MemberServerApplication.class, args); + SpringApplication.run(UserServerApplication.class, args); } } diff --git a/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/admin/package-info.java b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/admin/package-info.java new file mode 100644 index 0000000..f11c10e --- /dev/null +++ b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/admin/package-info.java @@ -0,0 +1 @@ +package com.tashow.cloud.user.controller.admin; \ No newline at end of file diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/admin/user/MemberUserController.java b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/admin/user/UserLoginController.java similarity index 50% rename from tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/admin/user/MemberUserController.java rename to tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/admin/user/UserLoginController.java index 77e0785..b469c96 100644 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/admin/user/MemberUserController.java +++ b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/admin/user/UserLoginController.java @@ -1,25 +1,20 @@ -package com.tashow.cloud.member.controller.admin.user; +package com.tashow.cloud.user.controller.admin.user; import cn.hutool.core.collection.CollUtil; import com.tashow.cloud.common.pojo.CommonResult; import com.tashow.cloud.common.pojo.PageResult; -import com.tashow.cloud.member.controller.admin.user.vo.MemberUserPageReqVO; -import com.tashow.cloud.member.controller.admin.user.vo.MemberUserRespVO; -import com.tashow.cloud.member.controller.admin.user.vo.MemberUserUpdateReqVO; -import com.tashow.cloud.member.convert.user.MemberUserConvert; -import com.tashow.cloud.member.dal.dataobject.user.MemberUserDO; -import com.tashow.cloud.member.service.user.MemberUserService; +import com.tashow.cloud.user.controller.admin.user.vo.UserLoginPageReqVO; +import com.tashow.cloud.user.controller.admin.user.vo.UserLoginRespVO; +import com.tashow.cloud.user.controller.admin.user.vo.MemberUserUpdateReqVO; +import com.tashow.cloud.user.convert.user.MemberUserConvert; +import com.tashow.cloud.user.dal.dataobject.user.UserLoginDO; +import com.tashow.cloud.user.service.user.UserLoginService; import jakarta.annotation.Resource; import jakarta.validation.Valid; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import java.util.Collection; -import java.util.Objects; -import java.util.Set; -import java.util.stream.Collectors; - import static com.tashow.cloud.common.pojo.CommonResult.success; @@ -27,45 +22,38 @@ import static com.tashow.cloud.common.pojo.CommonResult.success; @RestController @RequestMapping("/member/user") @Validated -public class MemberUserController { +public class UserLoginController { @Resource - private MemberUserService memberUserService; - @Resource + private UserLoginService loginUserService; + - @PutMapping("/update") // 更新会员用户 + @PutMapping("/update") @PreAuthorize("@ss.hasPermission('member:user:update')") public CommonResult updateUser(@Valid @RequestBody MemberUserUpdateReqVO updateReqVO) { - memberUserService.updateUser(updateReqVO); + loginUserService.updateUser(updateReqVO); return success(true); } - @GetMapping("/get") // 获得会员用户 // id: 编号，必填，示例：1024 + @GetMapping("/get") @PreAuthorize("@ss.hasPermission('member:user:query')") - public CommonResult getUser(@RequestParam("id") Long id) { - MemberUserDO user = memberUserService.getUser(id); + public CommonResult getUser(@RequestParam("id") Long id) { + UserLoginDO user = loginUserService.getUser(id); return success(MemberUserConvert.INSTANCE.convert03(user)); } - @GetMapping("/page") // 获得会员用户分页 + @GetMapping("/page") @PreAuthorize("@ss.hasPermission('member:user:query')") - public CommonResult> getUserPage(@Valid MemberUserPageReqVO pageVO) { - PageResult pageResult = memberUserService.getUserPage(pageVO); + public CommonResult> getUserPage(@Valid UserLoginPageReqVO pageVO) { + PageResult pageResult = loginUserService.getUserPage(pageVO); if (CollUtil.isEmpty(pageResult.getList())) { return success(PageResult.empty()); } - - // 处理用户标签返显 - Set tagIds = pageResult.getList().stream() - .map(MemberUserDO::getTagIds) - .filter(Objects::nonNull) - .flatMap(Collection::stream) - .collect(Collectors.toSet()); return success(MemberUserConvert.INSTANCE.convertPage(pageResult)); } diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/admin/user/vo/MemberUserUpdateLevelReqVO.java b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/admin/user/vo/MemberUserUpdateLevelReqVO.java similarity index 91% rename from tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/admin/user/vo/MemberUserUpdateLevelReqVO.java rename to tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/admin/user/vo/MemberUserUpdateLevelReqVO.java index 73c79e2..6e933ca 100644 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/admin/user/vo/MemberUserUpdateLevelReqVO.java +++ b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/admin/user/vo/MemberUserUpdateLevelReqVO.java @@ -1,4 +1,4 @@ -package com.tashow.cloud.member.controller.admin.user.vo; +package com.tashow.cloud.user.controller.admin.user.vo; import lombok.Data; import lombok.ToString; diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/admin/user/vo/MemberUserUpdatePointReqVO.java b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/admin/user/vo/MemberUserUpdatePointReqVO.java similarity index 89% rename from tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/admin/user/vo/MemberUserUpdatePointReqVO.java rename to tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/admin/user/vo/MemberUserUpdatePointReqVO.java index bb04c78..9249456 100644 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/admin/user/vo/MemberUserUpdatePointReqVO.java +++ b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/admin/user/vo/MemberUserUpdatePointReqVO.java @@ -1,4 +1,4 @@ -package com.tashow.cloud.member.controller.admin.user.vo; +package com.tashow.cloud.user.controller.admin.user.vo; import lombok.Data; import lombok.ToString; diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/admin/user/vo/MemberUserUpdateReqVO.java b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/admin/user/vo/MemberUserUpdateReqVO.java similarity index 74% rename from tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/admin/user/vo/MemberUserUpdateReqVO.java rename to tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/admin/user/vo/MemberUserUpdateReqVO.java index c48ceff..6f1b6cc 100644 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/admin/user/vo/MemberUserUpdateReqVO.java +++ b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/admin/user/vo/MemberUserUpdateReqVO.java @@ -1,4 +1,4 @@ -package com.tashow.cloud.member.controller.admin.user.vo; +package com.tashow.cloud.user.controller.admin.user.vo; import lombok.Data; import lombok.EqualsAndHashCode; @@ -10,7 +10,7 @@ import jakarta.validation.constraints.NotNull; @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) -public class MemberUserUpdateReqVO extends MemberUserBaseVO { +public class MemberUserUpdateReqVO extends UserBaseVO { // 编号，必填，示例：23788 @NotNull(message = "编号不能为空") diff --git a/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/admin/user/vo/UserBaseVO.java b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/admin/user/vo/UserBaseVO.java new file mode 100644 index 0000000..345f78e --- /dev/null +++ b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/admin/user/vo/UserBaseVO.java @@ -0,0 +1,34 @@ +package com.tashow.cloud.user.controller.admin.user.vo; + +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import org.hibernate.validator.constraints.URL; + + +/** + * 会员用户 Base VO，提供给添加、修改、详细的子 VO 使用 + * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成 + */ +@Data +public class UserBaseVO { + + // 手机号，必填，示例：15601691300 + @NotNull(message = "手机号不能为空") + private String mobile; + + // 状态，必填，示例：2 + @NotNull(message = "状态不能为空") + private Byte status; + + // 用户昵称，必填，示例：李四 + @NotNull(message = "用户昵称不能为空") + private String nickname; + + // 头像，必填，示例：https://www.iocoder.cn/x.png + @URL(message = "头像必须是 URL 格式") + private String avatar; + + // 备注，示例：我是小备注 + private String remark; + +} diff --git a/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/admin/user/vo/UserLoginPageReqVO.java b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/admin/user/vo/UserLoginPageReqVO.java new file mode 100644 index 0000000..8e4cfa3 --- /dev/null +++ b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/admin/user/vo/UserLoginPageReqVO.java @@ -0,0 +1,33 @@ +package com.tashow.cloud.user.controller.admin.user.vo; + +import com.tashow.cloud.common.pojo.PageParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; + +import static com.tashow.cloud.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + + +// 管理后台 - 会员用户分页 Request VO +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class UserLoginPageReqVO extends PageParam { + + // 搜索条件 手机号，昵称，姓名 + private String searchField; + + // 会员等级编号，示例：1 + private Long levelId; + + // 注册渠道 + private Integer registerTerminal; + + // 注册时间 + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] registDate; + +} diff --git a/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/admin/user/vo/UserLoginRespVO.java b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/admin/user/vo/UserLoginRespVO.java new file mode 100644 index 0000000..fb8ae97 --- /dev/null +++ b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/admin/user/vo/UserLoginRespVO.java @@ -0,0 +1,29 @@ +package com.tashow.cloud.user.controller.admin.user.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +import java.time.LocalDateTime; + +// 管理后台 - 会员用户 Response VO +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class UserLoginRespVO extends UserBaseVO { + + // 编号，必填，示例：23788 + private Long id; + + // 会员类型 + private Integer memberType; + + // 注册渠道 + private Integer registerTerminal; + // 注册渠道 + private LocalDateTime registerTime; + + // 最后登录时间，必填 + private LocalDateTime loginDate; + +} diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/auth/AppAuthController.http b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/app/auth/AppAuthController.http similarity index 100% rename from tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/auth/AppAuthController.http rename to tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/app/auth/AppAuthController.http diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/auth/AppAuthController.java b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/app/auth/AppAuthController.java similarity index 95% rename from tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/auth/AppAuthController.java rename to tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/app/auth/AppAuthController.java index cf9702a..8fcd084 100644 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/auth/AppAuthController.java +++ b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/app/auth/AppAuthController.java @@ -1,15 +1,15 @@ -package com.tashow.cloud.member.controller.app.auth; +package com.tashow.cloud.user.controller.app.auth; import cn.hutool.core.util.StrUtil; import com.tashow.cloud.common.enums.UserTypeEnum; import com.tashow.cloud.common.pojo.CommonResult; -import com.tashow.cloud.member.controller.app.auth.vo.*; -import com.tashow.cloud.member.convert.auth.AuthConvert; -import com.tashow.cloud.member.service.auth.MemberAuthService; import com.tashow.cloud.security.security.config.SecurityProperties; import com.tashow.cloud.security.security.core.util.SecurityFrameworkUtils; import com.tashow.cloud.systemapi.api.social.SocialClientApi; import com.tashow.cloud.systemapi.api.social.dto.SocialWxJsapiSignatureRespDTO; +import com.tashow.cloud.user.controller.app.auth.vo.*; +import com.tashow.cloud.user.convert.auth.AuthConvert; +import com.tashow.cloud.user.service.auth.MemberAuthService; import jakarta.annotation.Resource; import jakarta.annotation.security.PermitAll; import jakarta.servlet.http.HttpServletRequest; diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/auth/vo/AppAuthCheckCodeReqVO.java b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/app/auth/vo/AppAuthCheckCodeReqVO.java similarity index 95% rename from tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/auth/vo/AppAuthCheckCodeReqVO.java rename to tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/app/auth/vo/AppAuthCheckCodeReqVO.java index 8ee979f..12aed3a 100644 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/auth/vo/AppAuthCheckCodeReqVO.java +++ b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/app/auth/vo/AppAuthCheckCodeReqVO.java @@ -1,4 +1,4 @@ -package com.tashow.cloud.member.controller.app.auth.vo; +package com.tashow.cloud.user.controller.app.auth.vo; import com.tashow.cloud.common.validation.InEnum; import com.tashow.cloud.common.validation.Mobile; diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/auth/vo/AppAuthLoginReqVO.java b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/app/auth/vo/AppAuthLoginReqVO.java similarity index 96% rename from tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/auth/vo/AppAuthLoginReqVO.java rename to tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/app/auth/vo/AppAuthLoginReqVO.java index 0930d21..1382c7b 100644 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/auth/vo/AppAuthLoginReqVO.java +++ b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/app/auth/vo/AppAuthLoginReqVO.java @@ -1,4 +1,4 @@ -package com.tashow.cloud.member.controller.app.auth.vo; +package com.tashow.cloud.user.controller.app.auth.vo; import cn.hutool.core.util.StrUtil; import com.tashow.cloud.common.validation.InEnum; diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/auth/vo/AppAuthLoginRespVO.java b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/app/auth/vo/AppAuthLoginRespVO.java similarity index 92% rename from tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/auth/vo/AppAuthLoginRespVO.java rename to tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/app/auth/vo/AppAuthLoginRespVO.java index 2757c01..6cf8ee7 100644 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/auth/vo/AppAuthLoginRespVO.java +++ b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/app/auth/vo/AppAuthLoginRespVO.java @@ -1,4 +1,4 @@ -package com.tashow.cloud.member.controller.app.auth.vo; +package com.tashow.cloud.user.controller.app.auth.vo; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/auth/vo/AppAuthSmsLoginReqVO.java b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/app/auth/vo/AppAuthSmsLoginReqVO.java similarity index 96% rename from tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/auth/vo/AppAuthSmsLoginReqVO.java rename to tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/app/auth/vo/AppAuthSmsLoginReqVO.java index 779e325..75e7f6c 100644 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/auth/vo/AppAuthSmsLoginReqVO.java +++ b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/app/auth/vo/AppAuthSmsLoginReqVO.java @@ -1,4 +1,4 @@ -package com.tashow.cloud.member.controller.app.auth.vo; +package com.tashow.cloud.user.controller.app.auth.vo; import cn.hutool.core.util.StrUtil; import com.tashow.cloud.common.validation.InEnum; diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/auth/vo/AppAuthSmsSendReqVO.java b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/app/auth/vo/AppAuthSmsSendReqVO.java similarity index 91% rename from tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/auth/vo/AppAuthSmsSendReqVO.java rename to tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/app/auth/vo/AppAuthSmsSendReqVO.java index b7a5994..1ba918e 100644 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/auth/vo/AppAuthSmsSendReqVO.java +++ b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/app/auth/vo/AppAuthSmsSendReqVO.java @@ -1,4 +1,4 @@ -package com.tashow.cloud.member.controller.app.auth.vo; +package com.tashow.cloud.user.controller.app.auth.vo; import com.tashow.cloud.common.validation.InEnum; import com.tashow.cloud.common.validation.Mobile; diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/auth/vo/AppAuthSmsValidateReqVO.java b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/app/auth/vo/AppAuthSmsValidateReqVO.java similarity index 94% rename from tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/auth/vo/AppAuthSmsValidateReqVO.java rename to tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/app/auth/vo/AppAuthSmsValidateReqVO.java index 20680d5..90e1744 100644 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/auth/vo/AppAuthSmsValidateReqVO.java +++ b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/app/auth/vo/AppAuthSmsValidateReqVO.java @@ -1,4 +1,4 @@ -package com.tashow.cloud.member.controller.app.auth.vo; +package com.tashow.cloud.user.controller.app.auth.vo; import com.tashow.cloud.common.validation.InEnum; import com.tashow.cloud.common.validation.Mobile; diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/auth/vo/AppAuthSocialLoginReqVO.java b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/app/auth/vo/AppAuthSocialLoginReqVO.java similarity index 93% rename from tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/auth/vo/AppAuthSocialLoginReqVO.java rename to tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/app/auth/vo/AppAuthSocialLoginReqVO.java index 4fb3b04..ef4bada 100644 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/auth/vo/AppAuthSocialLoginReqVO.java +++ b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/app/auth/vo/AppAuthSocialLoginReqVO.java @@ -1,4 +1,4 @@ -package com.tashow.cloud.member.controller.app.auth.vo; +package com.tashow.cloud.user.controller.app.auth.vo; import com.tashow.cloud.common.validation.InEnum; import com.tashow.cloud.systemapi.enums.social.SocialTypeEnum; diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/auth/vo/AppAuthWeixinMiniAppLoginReqVO.java b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/app/auth/vo/AppAuthWeixinMiniAppLoginReqVO.java similarity index 93% rename from tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/auth/vo/AppAuthWeixinMiniAppLoginReqVO.java rename to tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/app/auth/vo/AppAuthWeixinMiniAppLoginReqVO.java index 8d9630b..a37da8e 100644 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/auth/vo/AppAuthWeixinMiniAppLoginReqVO.java +++ b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/app/auth/vo/AppAuthWeixinMiniAppLoginReqVO.java @@ -1,4 +1,4 @@ -package com.tashow.cloud.member.controller.app.auth.vo; +package com.tashow.cloud.user.controller.app.auth.vo; import jakarta.validation.constraints.NotEmpty; import lombok.AllArgsConstructor; diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/auth/vo/AuthWeixinJsapiSignatureRespVO.java b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/app/auth/vo/AuthWeixinJsapiSignatureRespVO.java similarity index 90% rename from tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/auth/vo/AuthWeixinJsapiSignatureRespVO.java rename to tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/app/auth/vo/AuthWeixinJsapiSignatureRespVO.java index 9902e71..fd4a3a6 100644 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/auth/vo/AuthWeixinJsapiSignatureRespVO.java +++ b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/app/auth/vo/AuthWeixinJsapiSignatureRespVO.java @@ -1,4 +1,4 @@ -package com.tashow.cloud.member.controller.app.auth.vo; +package com.tashow.cloud.user.controller.app.auth.vo; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/user/AppMemberUserController.http b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/app/user/AppMemberUserController.http similarity index 100% rename from tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/user/AppMemberUserController.http rename to tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/app/user/AppMemberUserController.http diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/user/AppMemberUserController.java b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/app/user/AppMemberUserController.java similarity index 84% rename from tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/user/AppMemberUserController.java rename to tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/app/user/AppMemberUserController.java index 6db042a..f5e242b 100644 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/user/AppMemberUserController.java +++ b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/app/user/AppMemberUserController.java @@ -1,10 +1,10 @@ -package com.tashow.cloud.member.controller.app.user; +package com.tashow.cloud.user.controller.app.user; import com.tashow.cloud.common.pojo.CommonResult; -import com.tashow.cloud.member.controller.app.user.vo.*; -import com.tashow.cloud.member.convert.user.MemberUserConvert; -import com.tashow.cloud.member.dal.dataobject.user.MemberUserDO; -import com.tashow.cloud.member.service.user.MemberUserService; +import com.tashow.cloud.user.controller.app.user.vo.*; +import com.tashow.cloud.user.convert.user.MemberUserConvert; +import com.tashow.cloud.user.dal.dataobject.user.UserLoginDO; +import com.tashow.cloud.user.service.user.UserLoginService; import jakarta.annotation.Resource; import jakarta.annotation.security.PermitAll; import jakarta.validation.Valid; @@ -24,12 +24,12 @@ import static com.tashow.cloud.security.security.core.util.SecurityFrameworkUtil public class AppMemberUserController { @Resource - private MemberUserService userService; + private UserLoginService userService; @GetMapping("/get") // 获得基本信息 public CommonResult getUserInfo() { - MemberUserDO user = userService.getUser(getLoginUserId()); + UserLoginDO user = userService.getUser(getLoginUserId()); return success(MemberUserConvert.INSTANCE.convert(user)); } diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/user/vo/AppMemberUserInfoRespVO.java b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/app/user/vo/AppMemberUserInfoRespVO.java similarity index 94% rename from tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/user/vo/AppMemberUserInfoRespVO.java rename to tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/app/user/vo/AppMemberUserInfoRespVO.java index b51609c..d485a25 100644 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/user/vo/AppMemberUserInfoRespVO.java +++ b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/app/user/vo/AppMemberUserInfoRespVO.java @@ -1,4 +1,4 @@ -package com.tashow.cloud.member.controller.app.user.vo; +package com.tashow.cloud.user.controller.app.user.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/user/vo/AppMemberUserResetPasswordReqVO.java b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/app/user/vo/AppMemberUserResetPasswordReqVO.java similarity index 95% rename from tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/user/vo/AppMemberUserResetPasswordReqVO.java rename to tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/app/user/vo/AppMemberUserResetPasswordReqVO.java index 57ef94d..5d8dbdb 100644 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/user/vo/AppMemberUserResetPasswordReqVO.java +++ b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/app/user/vo/AppMemberUserResetPasswordReqVO.java @@ -1,4 +1,4 @@ -package com.tashow.cloud.member.controller.app.user.vo; +package com.tashow.cloud.user.controller.app.user.vo; import com.tashow.cloud.common.validation.Mobile; diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/user/vo/AppMemberUserUpdateMobileByWeixinReqVO.java b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/app/user/vo/AppMemberUserUpdateMobileByWeixinReqVO.java similarity index 87% rename from tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/user/vo/AppMemberUserUpdateMobileByWeixinReqVO.java rename to tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/app/user/vo/AppMemberUserUpdateMobileByWeixinReqVO.java index ee8a40b..b8e7606 100644 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/user/vo/AppMemberUserUpdateMobileByWeixinReqVO.java +++ b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/app/user/vo/AppMemberUserUpdateMobileByWeixinReqVO.java @@ -1,4 +1,4 @@ -package com.tashow.cloud.member.controller.app.user.vo; +package com.tashow.cloud.user.controller.app.user.vo; import jakarta.validation.constraints.NotEmpty; import lombok.Data; diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/user/vo/AppMemberUserUpdateMobileReqVO.java b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/app/user/vo/AppMemberUserUpdateMobileReqVO.java similarity index 95% rename from tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/user/vo/AppMemberUserUpdateMobileReqVO.java rename to tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/app/user/vo/AppMemberUserUpdateMobileReqVO.java index 209bd29..8e0e7a3 100644 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/user/vo/AppMemberUserUpdateMobileReqVO.java +++ b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/app/user/vo/AppMemberUserUpdateMobileReqVO.java @@ -1,4 +1,4 @@ -package com.tashow.cloud.member.controller.app.user.vo; +package com.tashow.cloud.user.controller.app.user.vo; import com.tashow.cloud.common.validation.Mobile; import jakarta.validation.constraints.NotBlank; diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/user/vo/AppMemberUserUpdatePasswordReqVO.java b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/app/user/vo/AppMemberUserUpdatePasswordReqVO.java similarity index 94% rename from tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/user/vo/AppMemberUserUpdatePasswordReqVO.java rename to tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/app/user/vo/AppMemberUserUpdatePasswordReqVO.java index a813f8b..8b00b34 100644 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/user/vo/AppMemberUserUpdatePasswordReqVO.java +++ b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/app/user/vo/AppMemberUserUpdatePasswordReqVO.java @@ -1,4 +1,4 @@ -package com.tashow.cloud.member.controller.app.user.vo; +package com.tashow.cloud.user.controller.app.user.vo; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/user/vo/AppMemberUserUpdateReqVO.java b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/app/user/vo/AppMemberUserUpdateReqVO.java similarity index 88% rename from tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/user/vo/AppMemberUserUpdateReqVO.java rename to tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/app/user/vo/AppMemberUserUpdateReqVO.java index 9e00fad..4bf77ff 100644 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/app/user/vo/AppMemberUserUpdateReqVO.java +++ b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/app/user/vo/AppMemberUserUpdateReqVO.java @@ -1,4 +1,4 @@ -package com.tashow.cloud.member.controller.app.user.vo; +package com.tashow.cloud.user.controller.app.user.vo; import lombok.Data; import org.hibernate.validator.constraints.URL; diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/package-info.java b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/package-info.java similarity index 85% rename from tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/package-info.java rename to tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/package-info.java index f11a3af..7da03af 100644 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/controller/package-info.java +++ b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/controller/package-info.java @@ -3,4 +3,4 @@ * 1. admin 包：提供给管理后台 yudao-ui-admin 前端项目 * 2. app 包：提供给用户 APP yudao-ui-app 前端项目，它的 Controller 和 VO 都要添加 App 前缀，用于和管理后台进行区分 */ -package com.tashow.cloud.member.controller; +package com.tashow.cloud.user.controller; diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/convert/auth/AuthConvert.java b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/convert/auth/AuthConvert.java similarity index 87% rename from tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/convert/auth/AuthConvert.java rename to tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/convert/auth/AuthConvert.java index 19f4972..8ad48b6 100644 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/convert/auth/AuthConvert.java +++ b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/convert/auth/AuthConvert.java @@ -1,7 +1,5 @@ -package com.tashow.cloud.member.convert.auth; +package com.tashow.cloud.user.convert.auth; -import com.tashow.cloud.member.controller.app.auth.vo.*; -import com.tashow.cloud.member.controller.app.user.vo.AppMemberUserResetPasswordReqVO; import com.tashow.cloud.systemapi.api.oauth2.dto.OAuth2AccessTokenRespDTO; import com.tashow.cloud.systemapi.api.sms.dto.code.SmsCodeSendReqDTO; import com.tashow.cloud.systemapi.api.sms.dto.code.SmsCodeUseReqDTO; @@ -10,6 +8,8 @@ import com.tashow.cloud.systemapi.api.social.dto.SocialUserBindReqDTO; import com.tashow.cloud.systemapi.api.social.dto.SocialUserUnbindReqDTO; import com.tashow.cloud.systemapi.api.social.dto.SocialWxJsapiSignatureRespDTO; import com.tashow.cloud.systemapi.enums.sms.SmsSceneEnum; +import com.tashow.cloud.user.controller.app.auth.vo.*; +import com.tashow.cloud.user.controller.app.user.vo.AppMemberUserResetPasswordReqVO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/convert/package-info.java b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/convert/package-info.java similarity index 65% rename from tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/convert/package-info.java rename to tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/convert/package-info.java index 6450242..9952d26 100644 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/convert/package-info.java +++ b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/convert/package-info.java @@ -3,4 +3,4 @@ * * 目前使用 MapStruct 框架 */ -package com.tashow.cloud.member.convert; +package com.tashow.cloud.user.convert; diff --git a/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/convert/user/MemberUserConvert.java b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/convert/user/MemberUserConvert.java new file mode 100644 index 0000000..4750851 --- /dev/null +++ b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/convert/user/MemberUserConvert.java @@ -0,0 +1,39 @@ +package com.tashow.cloud.user.convert.user; + +import com.tashow.cloud.common.pojo.PageResult; +import com.tashow.cloud.memberapi.api.user.dto.MemberUserRespDTO; +import com.tashow.cloud.user.controller.admin.user.vo.UserLoginRespVO; +import com.tashow.cloud.user.controller.admin.user.vo.MemberUserUpdateReqVO; +import com.tashow.cloud.user.controller.app.user.vo.AppMemberUserInfoRespVO; +import com.tashow.cloud.user.dal.dataobject.user.UserLoginDO; +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Mappings; +import org.mapstruct.factory.Mappers; + +import java.util.List; + + +@Mapper +public interface MemberUserConvert { + + MemberUserConvert INSTANCE = Mappers.getMapper(MemberUserConvert.class); + + AppMemberUserInfoRespVO convert(UserLoginDO bean); + + + @Mappings({ + @Mapping(source = "bean.id", target = "id"), + }) + + MemberUserRespDTO convert2(UserLoginDO bean); + + List convertList2(List list); + + UserLoginDO convert(MemberUserUpdateReqVO bean); + + PageResult convertPage(PageResult page); + + UserLoginRespVO convert03(UserLoginDO bean); + +} diff --git a/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/dal/dataobject/package-info.java b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/dal/dataobject/package-info.java new file mode 100644 index 0000000..1b44a01 --- /dev/null +++ b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/dal/dataobject/package-info.java @@ -0,0 +1 @@ +package com.tashow.cloud.user.dal.dataobject; \ No newline at end of file diff --git a/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/dal/dataobject/user/UserLoginDO.java b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/dal/dataobject/user/UserLoginDO.java new file mode 100644 index 0000000..8a01db5 --- /dev/null +++ b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/dal/dataobject/user/UserLoginDO.java @@ -0,0 +1,80 @@ +package com.tashow.cloud.user.dal.dataobject.user; + +import com.baomidou.mybatisplus.annotation.KeySequence; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.tashow.cloud.mybatis.mybatis.core.dataobject.BaseDO; +import lombok.*; + +import java.time.LocalDateTime; + +/** + * 登录用户 DO + * + * @author 芋道源码 + */ +@TableName("tz_user_login") +@KeySequence("tz_user_login_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class UserLoginDO extends BaseDO { + + /** + * 用户ID + */ + @TableId + private Long id; + /** + * 手机 + */ + private String mobile; + /** + * 加密后的密码 + */ + private String password; + /** + * 帐号状态 (枚举 CommonStatusEnum) + */ + private Integer status; + /** + * 注册 IP + */ + private String registerIp; + /** + * 注册渠道 (枚举 TerminalEnum) + */ + private Integer registerTerminal; + /** + * 注册时间 + */ + private LocalDateTime registerDate; + /** + * 最后登录IP + */ + private String loginIp; + /** + * 最后登录时间 + */ + private LocalDateTime loginDate; + /** + * 最后登录设备 + */ + private String loginTerminal; + /** + * 用户昵称 + */ + private String nickname; + /** + * 用户头像 + */ + private String avatar; + /** + * 用户备注 + */ + private String remark; + +} \ No newline at end of file diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/dal/dataobject/address/MemberAddressDO.java b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/dal/dataobject/user/UserMemberAddressDO.java similarity index 62% rename from tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/dal/dataobject/address/MemberAddressDO.java rename to tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/dal/dataobject/user/UserMemberAddressDO.java index 7529b2f..9ff86fd 100644 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/dal/dataobject/address/MemberAddressDO.java +++ b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/dal/dataobject/user/UserMemberAddressDO.java @@ -1,4 +1,4 @@ -package com.tashow.cloud.member.dal.dataobject.address; +package com.tashow.cloud.user.dal.dataobject.user; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableId; @@ -7,28 +7,25 @@ import com.tashow.cloud.mybatis.mybatis.core.dataobject.BaseDO; import lombok.*; /** - * 用户收件地址 DO + * 会员地址 DO * + * @author 芋道源码 */ -@TableName("member_address") -@KeySequence("member_address_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@TableName("tz_user_member_address") +@KeySequence("tz_user_member_address_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) @Builder @NoArgsConstructor @AllArgsConstructor -public class MemberAddressDO extends BaseDO { +public class UserMemberAddressDO extends BaseDO { - /** - * 编号 - */ - @TableId - private Long id; /** * 用户编号 */ - private Long userId; + @TableId + private Long id; /** * 收件人名称 */ @@ -47,9 +44,7 @@ public class MemberAddressDO extends BaseDO { private String detailAddress; /** * 是否默认 - * - * true - 默认收件地址 */ - private Boolean defaultStatus; + private Integer defaultStatus; -} +} \ No newline at end of file diff --git a/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/dal/dataobject/user/UserMemberDO.java b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/dal/dataobject/user/UserMemberDO.java new file mode 100644 index 0000000..25282fe --- /dev/null +++ b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/dal/dataobject/user/UserMemberDO.java @@ -0,0 +1,68 @@ +package com.tashow.cloud.user.dal.dataobject.user; + +import com.baomidou.mybatisplus.annotation.KeySequence; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.tashow.cloud.mybatis.mybatis.core.dataobject.BaseDO; +import lombok.*; + +import java.time.LocalDateTime; + +/** + * 会员信息 DO + * + * @author 芋道源码 + */ +@TableName("tz_user_member") +@KeySequence("tz_user_member_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class UserMemberDO extends BaseDO { + + /** + * 用户ID + */ + @TableId + private Long id; + /** + * 真实名字 + */ + private String name; + /** + * 性别 (枚举 SexEnum) + */ + private Integer sex; + /** + * 出生日期 + */ + private LocalDateTime birthday; + /** + * 所在地 (关联 Area.id 字段) + */ + private Integer areaId; + /** + * 积分 + */ + private Integer point; + /** + * 会员标签列表，以逗号分隔 + */ + private String tagIds; + /** + * 会员级别编号 (关联 MemberLevelDO.id 字段) + */ + private Long levelId; + /** + * 会员经验 + */ + private Integer experience; + /** + * 用户分组编号 (关联 MemberGroupDO.id 字段) + */ + private Long groupId; + +} \ No newline at end of file diff --git a/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/dal/dataobject/user/UserMemberLevelDO.java b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/dal/dataobject/user/UserMemberLevelDO.java new file mode 100644 index 0000000..5f7eb71 --- /dev/null +++ b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/dal/dataobject/user/UserMemberLevelDO.java @@ -0,0 +1,58 @@ +package com.tashow.cloud.user.dal.dataobject.user; + +import com.baomidou.mybatisplus.annotation.KeySequence; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.tashow.cloud.mybatis.mybatis.core.dataobject.BaseDO; +import lombok.*; + +/** + * 会员等级 DO + * + * @author 芋道源码 + */ +@TableName("tz_user_member_level") +@KeySequence("tz_user_member_level_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class UserMemberLevelDO extends BaseDO { + + /** + * ID + */ + @TableId + private Long id; + /** + * 等级名称 + */ + private String levelName; + /** + * 性别 (枚举 SexEnum) + */ + private Integer level; + /** + * 会员经验 + */ + private Integer experience; + /** + * 享受折扣 + */ + private Integer discountPercent; + /** + * 等级图标 + */ + private String icon; + /** + * 等级背景图 + */ + private String backgroundUrl; + /** + * 状态 + */ + private Integer status; + +} \ No newline at end of file diff --git a/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/dal/mysql/package-info.java b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/dal/mysql/package-info.java new file mode 100644 index 0000000..b390a89 --- /dev/null +++ b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/dal/mysql/package-info.java @@ -0,0 +1 @@ +package com.tashow.cloud.user.dal.mysql; \ No newline at end of file diff --git a/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/dal/mysql/user/UserLoginMapper.java b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/dal/mysql/user/UserLoginMapper.java new file mode 100644 index 0000000..cfd401d --- /dev/null +++ b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/dal/mysql/user/UserLoginMapper.java @@ -0,0 +1,71 @@ +package com.tashow.cloud.user.dal.mysql.user; + +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.tashow.cloud.common.pojo.PageResult; +import com.tashow.cloud.mybatis.mybatis.core.mapper.BaseMapperX; +import com.tashow.cloud.mybatis.mybatis.core.query.LambdaQueryWrapperX; +import com.tashow.cloud.user.controller.admin.user.vo.UserLoginPageReqVO; +import com.tashow.cloud.user.dal.dataobject.user.UserLoginDO; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * 会员 User Mapper + * + * @author 芋道源码 + */ +@Mapper +public interface UserLoginMapper extends BaseMapperX { + + default UserLoginDO selectByMobile(String mobile) { + return selectOne(UserLoginDO::getMobile, mobile); + } + + default List selectListByNicknameLike(String nickname) { + return selectList(new LambdaQueryWrapperX() + .likeIfPresent(UserLoginDO::getNickname, nickname)); + } + + default PageResult selectPage(UserLoginPageReqVO reqVO) { + // 分页查询 + return selectPage(reqVO, new LambdaQueryWrapperX() + .orderByDesc(UserLoginDO::getId)); + } + + default Long selectCountByTagId(Long tagId) { + return selectCount(new LambdaQueryWrapperX() + .apply("FIND_IN_SET({0}, tag_ids)", tagId)); + } + + /** + * 更新用户积分（增加） + * + * @param id 用户编号 + * @param incrCount 增加积分（正数） + */ + default void updatePointIncr(Long id, Integer incrCount) { + Assert.isTrue(incrCount > 0); + LambdaUpdateWrapper lambdaUpdateWrapper = new LambdaUpdateWrapper() + .setSql(" point = point + " + incrCount) + .eq(UserLoginDO::getId, id); + update(null, lambdaUpdateWrapper); + } + + /** + * 更新用户积分（减少） + * + * @param id 用户编号 + * @param incrCount 增加积分（负数） + * @return 更新行数 + */ + default int updatePointDecr(Long id, Integer incrCount) { + Assert.isTrue(incrCount < 0); + LambdaUpdateWrapper lambdaUpdateWrapper = new LambdaUpdateWrapper() + .setSql(" point = point + " + incrCount) // 负数，所以使用 + 号 + .eq(UserLoginDO::getId, id); + return update(null, lambdaUpdateWrapper); + } + +} diff --git a/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/dal/mysql/user/UserMemberAddressMapper.java b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/dal/mysql/user/UserMemberAddressMapper.java new file mode 100644 index 0000000..4775839 --- /dev/null +++ b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/dal/mysql/user/UserMemberAddressMapper.java @@ -0,0 +1,15 @@ +package com.tashow.cloud.user.dal.mysql.user; + +import com.tashow.cloud.mybatis.mybatis.core.mapper.BaseMapperX; +import com.tashow.cloud.user.dal.dataobject.user.UserMemberAddressDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * 会员地址 Mapper + * + * @author 芋道源码 + */ +@Mapper +public interface UserMemberAddressMapper extends BaseMapperX { + +} \ No newline at end of file diff --git a/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/dal/mysql/user/UserMemberLevelMapper.java b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/dal/mysql/user/UserMemberLevelMapper.java new file mode 100644 index 0000000..bd8001d --- /dev/null +++ b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/dal/mysql/user/UserMemberLevelMapper.java @@ -0,0 +1,16 @@ +package com.tashow.cloud.user.dal.mysql.user; + +import com.tashow.cloud.mybatis.mybatis.core.mapper.BaseMapperX; +import com.tashow.cloud.user.dal.dataobject.user.UserMemberLevelDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * 会员等级 Mapper + * + * @author 芋道源码 + */ +@Mapper +public interface UserMemberLevelMapper extends BaseMapperX { + + +} \ No newline at end of file diff --git a/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/dal/mysql/user/UserMemberMapper.java b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/dal/mysql/user/UserMemberMapper.java new file mode 100644 index 0000000..21cf671 --- /dev/null +++ b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/dal/mysql/user/UserMemberMapper.java @@ -0,0 +1,16 @@ +package com.tashow.cloud.user.dal.mysql.user; + +import com.tashow.cloud.mybatis.mybatis.core.mapper.BaseMapperX; +import com.tashow.cloud.user.dal.dataobject.user.UserMemberDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * 会员信息 Mapper + * + * @author 芋道源码 + */ +@Mapper +public interface UserMemberMapper extends BaseMapperX { + + +} \ No newline at end of file diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/dal/package-info.java b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/dal/package-info.java similarity index 84% rename from tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/dal/package-info.java rename to tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/dal/package-info.java index 215b6cb..5a0345e 100644 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/dal/package-info.java +++ b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/dal/package-info.java @@ -6,4 +6,4 @@ * * 其中，MySQL 的表以 member_ 作为前缀 */ -package com.tashow.cloud.member.dal; +package com.tashow.cloud.user.dal; diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/dal/redis/package-info.java b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/dal/redis/package-info.java similarity index 68% rename from tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/dal/redis/package-info.java rename to tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/dal/redis/package-info.java index cccf26d..ca0a283 100644 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/dal/redis/package-info.java +++ b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/dal/redis/package-info.java @@ -1,4 +1,4 @@ /** * 占位，后续有类后，可以删除，避免 package 无法提交到 Git 上 */ -package com.tashow.cloud.member.dal.redis; +package com.tashow.cloud.user.dal.redis; diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/framework/package-info.java b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/framework/package-info.java similarity index 64% rename from tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/framework/package-info.java rename to tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/framework/package-info.java index 86ec634..9495ebf 100644 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/framework/package-info.java +++ b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/framework/package-info.java @@ -3,4 +3,4 @@ * * @author 芋道源码 */ -package com.tashow.cloud.member.framework; +package com.tashow.cloud.user.framework; diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/framework/rpc/config/RpcConfiguration.java b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/framework/rpc/config/RpcConfiguration.java similarity index 91% rename from tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/framework/rpc/config/RpcConfiguration.java rename to tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/framework/rpc/config/RpcConfiguration.java index d4c1d68..dca03cd 100644 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/framework/rpc/config/RpcConfiguration.java +++ b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/framework/rpc/config/RpcConfiguration.java @@ -1,4 +1,4 @@ -package com.tashow.cloud.member.framework.rpc.config; +package com.tashow.cloud.user.framework.rpc.config; import com.tashow.cloud.systemapi.api.logger.LoginLogApi; import com.tashow.cloud.systemapi.api.sms.SmsCodeApi; diff --git a/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/framework/rpc/package-info.java b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/framework/rpc/package-info.java new file mode 100644 index 0000000..0017bf6 --- /dev/null +++ b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/framework/rpc/package-info.java @@ -0,0 +1,4 @@ +/** + * 占位 + */ +package com.tashow.cloud.user.framework.rpc; diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/framework/security/config/SecurityConfiguration.java b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/framework/security/config/SecurityConfiguration.java similarity index 96% rename from tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/framework/security/config/SecurityConfiguration.java rename to tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/framework/security/config/SecurityConfiguration.java index 035fc98..a34366f 100644 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/framework/security/config/SecurityConfiguration.java +++ b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/framework/security/config/SecurityConfiguration.java @@ -1,4 +1,4 @@ -package com.tashow.cloud.member.framework.security.config; +package com.tashow.cloud.user.framework.security.config; import com.tashow.cloud.memberapi.enums.ApiConstants; import com.tashow.cloud.security.security.config.AuthorizeRequestsCustomizer; diff --git a/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/framework/security/core/package-info.java b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/framework/security/core/package-info.java new file mode 100644 index 0000000..3a675c9 --- /dev/null +++ b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/framework/security/core/package-info.java @@ -0,0 +1,4 @@ +/** + * 占位 + */ +package com.tashow.cloud.user.framework.security.core; diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/service/auth/MemberAuthService.java b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/service/auth/MemberAuthService.java similarity index 94% rename from tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/service/auth/MemberAuthService.java rename to tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/service/auth/MemberAuthService.java index 303a4d7..22028e8 100644 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/service/auth/MemberAuthService.java +++ b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/service/auth/MemberAuthService.java @@ -1,7 +1,7 @@ -package com.tashow.cloud.member.service.auth; +package com.tashow.cloud.user.service.auth; -import com.tashow.cloud.member.controller.app.auth.vo.*; +import com.tashow.cloud.user.controller.app.auth.vo.*; import jakarta.validation.Valid; /** diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/service/auth/MemberAuthServiceImpl.java b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/service/auth/MemberAuthServiceImpl.java similarity index 91% rename from tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/service/auth/MemberAuthServiceImpl.java rename to tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/service/auth/MemberAuthServiceImpl.java index 6561b40..97ab2cd 100644 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/service/auth/MemberAuthServiceImpl.java +++ b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/service/auth/MemberAuthServiceImpl.java @@ -1,4 +1,4 @@ -package com.tashow.cloud.member.service.auth; +package com.tashow.cloud.user.service.auth; import cn.hutool.core.lang.Assert; import com.tashow.cloud.common.enums.CommonStatusEnum; @@ -6,10 +6,6 @@ import com.tashow.cloud.common.enums.TerminalEnum; import com.tashow.cloud.common.enums.UserTypeEnum; import com.tashow.cloud.common.util.monitor.TracerUtils; import com.tashow.cloud.common.util.servlet.ServletUtils; -import com.tashow.cloud.member.controller.app.auth.vo.*; -import com.tashow.cloud.member.convert.auth.AuthConvert; -import com.tashow.cloud.member.dal.dataobject.user.MemberUserDO; -import com.tashow.cloud.member.service.user.MemberUserService; import com.tashow.cloud.systemapi.api.logger.LoginLogApi; import com.tashow.cloud.systemapi.api.logger.dto.LoginLogCreateReqDTO; import com.tashow.cloud.systemapi.api.oauth2.OAuth2TokenApi; @@ -26,6 +22,10 @@ import com.tashow.cloud.systemapi.enums.logger.LoginResultEnum; import com.tashow.cloud.systemapi.enums.oauth2.OAuth2ClientConstants; import com.tashow.cloud.systemapi.enums.sms.SmsSceneEnum; import com.tashow.cloud.systemapi.enums.social.SocialTypeEnum; +import com.tashow.cloud.user.controller.app.auth.vo.*; +import com.tashow.cloud.user.convert.auth.AuthConvert; +import com.tashow.cloud.user.dal.dataobject.user.UserLoginDO; +import com.tashow.cloud.user.service.user.UserLoginService; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -50,7 +50,7 @@ import static com.tashow.cloud.web.web.core.util.WebFrameworkUtils.getTerminal; public class MemberAuthServiceImpl implements MemberAuthService { @Resource - private MemberUserService userService; + private UserLoginService userService; @Resource private SmsCodeApi smsCodeApi; @Resource @@ -65,7 +65,7 @@ public class MemberAuthServiceImpl implements MemberAuthService { @Override public AppAuthLoginRespVO login(AppAuthLoginReqVO reqVO) { // 使用手机 + 密码，进行登录。 - MemberUserDO user = login0(reqVO.getMobile(), reqVO.getPassword()); + UserLoginDO user = login0(reqVO.getMobile(), reqVO.getPassword()); // 如果 socialType 非空，说明需要绑定社交用户 String openid = null; @@ -86,7 +86,7 @@ public class MemberAuthServiceImpl implements MemberAuthService { smsCodeApi.useSmsCode(AuthConvert.INSTANCE.convert(reqVO, SmsSceneEnum.MEMBER_LOGIN.getScene(), userIp)).checkError(); // 获得获得注册用户 - MemberUserDO user = userService.createUserIfAbsent(reqVO.getMobile(), userIp, getTerminal()); + UserLoginDO user = userService.createUserIfAbsent(reqVO.getMobile(), userIp, getTerminal()); Assert.notNull(user, "获取用户失败，结果为空"); // 校验是否禁用 @@ -117,7 +117,7 @@ public class MemberAuthServiceImpl implements MemberAuthService { } // 情况一：已绑定，直接读取用户信息 - MemberUserDO user; + UserLoginDO user; if (socialUser.getUserId() != null) { user = userService.getUser(socialUser.getUserId()); // 情况二：未绑定，注册用户 + 绑定用户 @@ -142,7 +142,7 @@ public class MemberAuthServiceImpl implements MemberAuthService { Assert.notNull(phoneNumberInfo, "获得手机信息失败，结果为空"); // 获得获得注册用户 - MemberUserDO user = userService.createUserIfAbsent(phoneNumberInfo.getPurePhoneNumber(), + UserLoginDO user = userService.createUserIfAbsent(phoneNumberInfo.getPurePhoneNumber(), getClientIP(), TerminalEnum.WECHAT_MINI_PROGRAM.getTerminal()); Assert.notNull(user, "获取用户失败，结果为空"); @@ -154,7 +154,7 @@ public class MemberAuthServiceImpl implements MemberAuthService { return createTokenAfterLoginSuccess(user, user.getMobile(), LoginLogTypeEnum.LOGIN_SOCIAL, openid); } - private AppAuthLoginRespVO createTokenAfterLoginSuccess(MemberUserDO user, String mobile, + private AppAuthLoginRespVO createTokenAfterLoginSuccess(UserLoginDO user, String mobile, LoginLogTypeEnum logType, String openid) { // 插入登陆日志 createLoginLog(user.getId(), mobile, logType, LoginResultEnum.SUCCESS); @@ -171,10 +171,10 @@ public class MemberAuthServiceImpl implements MemberAuthService { return socialClientApi.getAuthorizeUrl(type, UserTypeEnum.MEMBER.getValue(), redirectUri).getCheckedData(); } - private MemberUserDO login0(String mobile, String password) { + private UserLoginDO login0(String mobile, String password) { final LoginLogTypeEnum logTypeEnum = LoginLogTypeEnum.LOGIN_MOBILE; // 校验账号是否存在 - MemberUserDO user = userService.getUserByMobile(mobile); + UserLoginDO user = userService.getUserByMobile(mobile); if (user == null) { createLoginLog(null, mobile, logTypeEnum, LoginResultEnum.BAD_CREDENTIALS); throw exception(AUTH_LOGIN_BAD_CREDENTIALS); @@ -224,21 +224,21 @@ public class MemberAuthServiceImpl implements MemberAuthService { public void sendSmsCode(Long userId, AppAuthSmsSendReqVO reqVO) { // 情况 1：如果是修改手机场景，需要校验新手机号是否已经注册，说明不能使用该手机了 if (Objects.equals(reqVO.getScene(), SmsSceneEnum.MEMBER_UPDATE_MOBILE.getScene())) { - MemberUserDO user = userService.getUserByMobile(reqVO.getMobile()); + UserLoginDO user = userService.getUserByMobile(reqVO.getMobile()); if (user != null && !Objects.equals(user.getId(), userId)) { throw exception(AUTH_MOBILE_USED); } } // 情况 2：如果是重置密码场景，需要校验手机号是存在的 if (Objects.equals(reqVO.getScene(), SmsSceneEnum.MEMBER_RESET_PASSWORD.getScene())) { - MemberUserDO user = userService.getUserByMobile(reqVO.getMobile()); + UserLoginDO user = userService.getUserByMobile(reqVO.getMobile()); if (user == null) { throw exception(USER_MOBILE_NOT_EXISTS); } } // 情况 3：如果是修改密码场景，需要查询手机号，无需前端传递 if (Objects.equals(reqVO.getScene(), SmsSceneEnum.MEMBER_UPDATE_PASSWORD.getScene())) { - MemberUserDO user = userService.getUser(userId); + UserLoginDO user = userService.getUser(userId); // TODO 芋艿：后续 member user 手机非强绑定，这块需要做下调整； reqVO.setMobile(user.getMobile()); } @@ -276,7 +276,7 @@ public class MemberAuthServiceImpl implements MemberAuthService { if (userId == null) { return null; } - MemberUserDO user = userService.getUser(userId); + UserLoginDO user = userService.getUser(userId); return user != null ? user.getMobile() : null; } diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/service/user/MemberUserService.java b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/service/user/UserLoginService.java similarity index 75% rename from tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/service/user/MemberUserService.java rename to tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/service/user/UserLoginService.java index 77c748c..0c6f872 100644 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/service/user/MemberUserService.java +++ b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/service/user/UserLoginService.java @@ -1,12 +1,12 @@ -package com.tashow.cloud.member.service.user; +package com.tashow.cloud.user.service.user; import com.tashow.cloud.common.enums.TerminalEnum; import com.tashow.cloud.common.pojo.PageResult; import com.tashow.cloud.common.validation.Mobile; -import com.tashow.cloud.member.controller.admin.user.vo.MemberUserPageReqVO; -import com.tashow.cloud.member.controller.admin.user.vo.MemberUserUpdateReqVO; -import com.tashow.cloud.member.controller.app.user.vo.*; -import com.tashow.cloud.member.dal.dataobject.user.MemberUserDO; +import com.tashow.cloud.user.controller.admin.user.vo.UserLoginPageReqVO; +import com.tashow.cloud.user.controller.admin.user.vo.MemberUserUpdateReqVO; +import com.tashow.cloud.user.controller.app.user.vo.*; +import com.tashow.cloud.user.dal.dataobject.user.UserLoginDO; import jakarta.validation.Valid; import java.util.Collection; @@ -17,7 +17,7 @@ import java.util.List; * * @author 芋道源码 */ -public interface MemberUserService { +public interface UserLoginService { /** * 通过手机查询用户 @@ -25,7 +25,7 @@ public interface MemberUserService { * @param mobile 手机 * @return 用户对象 */ - MemberUserDO getUserByMobile(String mobile); + UserLoginDO getUserByMobile(String mobile); /** * 基于用户昵称，模糊匹配用户列表 @@ -33,7 +33,7 @@ public interface MemberUserService { * @param nickname 用户昵称，模糊匹配 * @return 用户信息的列表 */ - List getUserListByNickname(String nickname); + List getUserListByNickname(String nickname); /** * 基于手机号创建用户。 @@ -44,7 +44,7 @@ public interface MemberUserService { * @param terminal 终端 {@link TerminalEnum} * @return 用户对象 */ - MemberUserDO createUserIfAbsent(@Mobile String mobile, String registerIp, Integer terminal); + UserLoginDO createUserIfAbsent(@Mobile String mobile, String registerIp, Integer terminal); /** * 创建用户 @@ -56,7 +56,7 @@ public interface MemberUserService { * @param terminal 终端 {@link TerminalEnum} * @return 用户对象 */ - MemberUserDO createUser(String nickname, String avtar, String registerIp, Integer terminal); + UserLoginDO createUser(String nickname, String avtar, String registerIp, Integer terminal); /** * 更新用户的最后登陆信息 @@ -72,7 +72,7 @@ public interface MemberUserService { * @param id 用户ID * @return 用户对象信息 */ - MemberUserDO getUser(Long id); + UserLoginDO getUser(Long id); /** * 通过用户 ID 查询用户们 @@ -80,7 +80,7 @@ public interface MemberUserService { * @param ids 用户 ID * @return 用户对象信息数组 */ - List getUserList(Collection ids); + List getUserList(Collection ids); /** * 【会员】修改基本信息 @@ -143,7 +143,7 @@ public interface MemberUserService { * @param pageReqVO 分页查询 * @return 会员用户分页 */ - PageResult getUserPage(MemberUserPageReqVO pageReqVO); + PageResult getUserPage(UserLoginPageReqVO pageReqVO); /** * 更新用户的等级和经验 @@ -154,22 +154,6 @@ public interface MemberUserService { */ void updateUserLevel(Long id, Long levelId, Integer experience); - /** - * 获得指定用户分组下的用户数量 - * - * @param groupId 用户分组编号 - * @return 用户数量 - */ - Long getUserCountByGroupId(Long groupId); - - /** - * 获得指定用户等级下的用户数量 - * - * @param levelId 用户等级编号 - * @return 用户数量 - */ - Long getUserCountByLevelId(Long levelId); - /** * 获得指定会员标签下的用户数量 * diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/service/user/MemberUserServiceImpl.java b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/service/user/UserLoginServiceImpl.java similarity index 74% rename from tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/service/user/MemberUserServiceImpl.java rename to tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/service/user/UserLoginServiceImpl.java index 7aed156..4b0ba0f 100644 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/service/user/MemberUserServiceImpl.java +++ b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/service/user/UserLoginServiceImpl.java @@ -1,4 +1,4 @@ -package com.tashow.cloud.member.service.user; +package com.tashow.cloud.user.service.user; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.ListUtil; @@ -12,19 +12,18 @@ import com.tashow.cloud.common.enums.CommonStatusEnum; import com.tashow.cloud.common.enums.UserTypeEnum; import com.tashow.cloud.common.pojo.PageResult; import com.tashow.cloud.common.util.object.BeanUtils; -import com.tashow.cloud.member.controller.admin.user.vo.MemberUserPageReqVO; -import com.tashow.cloud.member.controller.admin.user.vo.MemberUserUpdateReqVO; -import com.tashow.cloud.member.controller.app.user.vo.*; -import com.tashow.cloud.member.convert.auth.AuthConvert; -import com.tashow.cloud.member.convert.user.MemberUserConvert; -import com.tashow.cloud.member.dal.dataobject.user.MemberUserDO; -import com.tashow.cloud.member.dal.mysql.user.MemberUserMapper; -import com.tashow.cloud.member.mq.producer.user.MemberUserProducer; import com.tashow.cloud.systemapi.api.sms.SmsCodeApi; import com.tashow.cloud.systemapi.api.sms.dto.code.SmsCodeUseReqDTO; import com.tashow.cloud.systemapi.api.social.SocialClientApi; import com.tashow.cloud.systemapi.api.social.dto.SocialWxPhoneNumberInfoRespDTO; import com.tashow.cloud.systemapi.enums.sms.SmsSceneEnum; +import com.tashow.cloud.user.controller.admin.user.vo.UserLoginPageReqVO; +import com.tashow.cloud.user.controller.admin.user.vo.MemberUserUpdateReqVO; +import com.tashow.cloud.user.controller.app.user.vo.*; +import com.tashow.cloud.user.convert.auth.AuthConvert; +import com.tashow.cloud.user.convert.user.MemberUserConvert; +import com.tashow.cloud.user.dal.dataobject.user.UserLoginDO; +import com.tashow.cloud.user.dal.mysql.user.UserLoginMapper; import jakarta.annotation.Resource; import jakarta.validation.Valid; import lombok.extern.slf4j.Slf4j; @@ -53,10 +52,10 @@ import static com.tashow.cloud.systemapi.enums.ErrorCodeConstants.USER_NOT_EXIST @Service @Valid @Slf4j -public class MemberUserServiceImpl implements MemberUserService { +public class UserLoginServiceImpl implements UserLoginService { @Resource - private MemberUserMapper memberUserMapper; + private UserLoginMapper memberUserMapper; @Resource private SmsCodeApi smsCodeApi; @@ -67,24 +66,22 @@ public class MemberUserServiceImpl implements MemberUserService { @Resource private PasswordEncoder passwordEncoder; - @Resource - private MemberUserProducer memberUserProducer; @Override - public MemberUserDO getUserByMobile(String mobile) { + public UserLoginDO getUserByMobile(String mobile) { return memberUserMapper.selectByMobile(mobile); } @Override - public List getUserListByNickname(String nickname) { + public List getUserListByNickname(String nickname) { return memberUserMapper.selectListByNicknameLike(nickname); } @Override @Transactional(rollbackFor = Exception.class) - public MemberUserDO createUserIfAbsent(String mobile, String registerIp, Integer terminal) { + public UserLoginDO createUserIfAbsent(String mobile, String registerIp, Integer terminal) { // 用户已经存在 - MemberUserDO user = memberUserMapper.selectByMobile(mobile); + UserLoginDO user = memberUserMapper.selectByMobile(mobile); if (user != null) { return user; } @@ -94,16 +91,16 @@ public class MemberUserServiceImpl implements MemberUserService { @Override @Transactional(rollbackFor = Exception.class) - public MemberUserDO createUser(String nickname, String avtar, String registerIp, Integer terminal) { + public UserLoginDO createUser(String nickname, String avtar, String registerIp, Integer terminal) { return createUser(null, nickname, avtar, registerIp, terminal); } - private MemberUserDO createUser(String mobile, String nickname, String avtar, - String registerIp, Integer terminal) { + private UserLoginDO createUser(String mobile, String nickname, String avtar, + String registerIp, Integer terminal) { // 生成密码 String password = IdUtil.fastSimpleUUID(); // 插入用户 - MemberUserDO user = new MemberUserDO(); + UserLoginDO user = new UserLoginDO(); user.setMobile(mobile); user.setStatus(CommonStatusEnum.ENABLE.getStatus()); // 默认开启 user.setPassword(encodePassword(password)); // 加密密码 @@ -120,7 +117,6 @@ public class MemberUserServiceImpl implements MemberUserService { @Override public void afterCommit() { - memberUserProducer.sendUserCreateMessage(user.getId()); } }); @@ -129,17 +125,17 @@ public class MemberUserServiceImpl implements MemberUserService { @Override public void updateUserLogin(Long id, String loginIp) { - memberUserMapper.updateById(new MemberUserDO().setId(id) + memberUserMapper.updateById(new UserLoginDO().setId(id) .setLoginIp(loginIp).setLoginDate(LocalDateTime.now())); } @Override - public MemberUserDO getUser(Long id) { + public UserLoginDO getUser(Long id) { return memberUserMapper.selectById(id); } @Override - public List getUserList(Collection ids) { + public List getUserList(Collection ids) { if (CollUtil.isEmpty(ids)) { return ListUtil.empty(); } @@ -148,7 +144,7 @@ public class MemberUserServiceImpl implements MemberUserService { @Override public void updateUser(Long userId, AppMemberUserUpdateReqVO reqVO) { - MemberUserDO updateObj = BeanUtils.toBean(reqVO, MemberUserDO.class).setId(userId); + UserLoginDO updateObj = BeanUtils.toBean(reqVO, UserLoginDO.class).setId(userId); memberUserMapper.updateById(updateObj); } @@ -156,7 +152,7 @@ public class MemberUserServiceImpl implements MemberUserService { @Transactional(rollbackFor = Exception.class) public void updateUserMobile(Long userId, AppMemberUserUpdateMobileReqVO reqVO) { // 1.1 检测用户是否存在 - MemberUserDO user = validateUserExists(userId); + UserLoginDO user = validateUserExists(userId); // 1.2 校验新手机是否已经被绑定 validateMobileUnique(null, reqVO.getMobile()); @@ -171,7 +167,7 @@ public class MemberUserServiceImpl implements MemberUserService { .setScene(SmsSceneEnum.MEMBER_UPDATE_MOBILE.getScene()).setUsedIp(getClientIP())).checkError(); // 3. 更新用户手机 - memberUserMapper.updateById(MemberUserDO.builder().id(userId).mobile(reqVO.getMobile()).build()); + memberUserMapper.updateById(UserLoginDO.builder().id(userId).mobile(reqVO.getMobile()).build()); } @Override @@ -184,38 +180,38 @@ public class MemberUserServiceImpl implements MemberUserService { validateMobileUnique(userId, phoneNumberInfo.getPhoneNumber()); // 2. 更新用户手机 - memberUserMapper.updateById(MemberUserDO.builder().id(userId).mobile(phoneNumberInfo.getPhoneNumber()).build()); + memberUserMapper.updateById(UserLoginDO.builder().id(userId).mobile(phoneNumberInfo.getPhoneNumber()).build()); } @Override public void updateUserPassword(Long userId, AppMemberUserUpdatePasswordReqVO reqVO) { // 检测用户是否存在 - MemberUserDO user = validateUserExists(userId); + UserLoginDO user = validateUserExists(userId); // 校验验证码 smsCodeApi.useSmsCode(new SmsCodeUseReqDTO().setMobile(user.getMobile()).setCode(reqVO.getCode()) .setScene(SmsSceneEnum.MEMBER_UPDATE_PASSWORD.getScene()).setUsedIp(getClientIP())).checkError(); // 更新用户密码 - memberUserMapper.updateById(MemberUserDO.builder().id(userId) + memberUserMapper.updateById(UserLoginDO.builder().id(userId) .password(passwordEncoder.encode(reqVO.getPassword())).build()); } @Override public void resetUserPassword(AppMemberUserResetPasswordReqVO reqVO) { // 检验用户是否存在 - MemberUserDO user = validateUserExists(reqVO.getMobile()); + UserLoginDO user = validateUserExists(reqVO.getMobile()); // 使用验证码 smsCodeApi.useSmsCode(AuthConvert.INSTANCE.convert(reqVO, SmsSceneEnum.MEMBER_RESET_PASSWORD, getClientIP())).checkError(); // 更新密码 - memberUserMapper.updateById(MemberUserDO.builder().id(user.getId()) + memberUserMapper.updateById(UserLoginDO.builder().id(user.getId()) .password(passwordEncoder.encode(reqVO.getPassword())).build()); } - private MemberUserDO validateUserExists(String mobile) { - MemberUserDO user = memberUserMapper.selectByMobile(mobile); + private UserLoginDO validateUserExists(String mobile) { + UserLoginDO user = memberUserMapper.selectByMobile(mobile); if (user == null) { throw exception(USER_MOBILE_NOT_EXISTS); } @@ -246,16 +242,16 @@ public class MemberUserServiceImpl implements MemberUserService { validateMobileUnique(updateReqVO.getId(), updateReqVO.getMobile()); // 更新 - MemberUserDO updateObj = MemberUserConvert.INSTANCE.convert(updateReqVO); + UserLoginDO updateObj = MemberUserConvert.INSTANCE.convert(updateReqVO); memberUserMapper.updateById(updateObj); } @VisibleForTesting - MemberUserDO validateUserExists(Long id) { + UserLoginDO validateUserExists(Long id) { if (id == null) { return null; } - MemberUserDO user = memberUserMapper.selectById(id); + UserLoginDO user = memberUserMapper.selectById(id); if (user == null) { throw exception(USER_NOT_EXISTS); } @@ -267,7 +263,7 @@ public class MemberUserServiceImpl implements MemberUserService { if (StrUtil.isBlank(mobile)) { return; } - MemberUserDO user = memberUserMapper.selectByMobile(mobile); + UserLoginDO user = memberUserMapper.selectByMobile(mobile); if (user == null) { return; } @@ -281,7 +277,7 @@ public class MemberUserServiceImpl implements MemberUserService { } @Override - public PageResult getUserPage(MemberUserPageReqVO pageReqVO) { + public PageResult getUserPage(UserLoginPageReqVO pageReqVO) { return memberUserMapper.selectPage(pageReqVO); } @@ -289,22 +285,11 @@ public class MemberUserServiceImpl implements MemberUserService { public void updateUserLevel(Long id, Long levelId, Integer experience) { // 0 代表无等级：防止UpdateById时，会被过滤掉的问题 levelId = ObjectUtil.defaultIfNull(levelId, 0L); - memberUserMapper.updateById(new MemberUserDO() + memberUserMapper.updateById(new UserLoginDO() .setId(id) - .setLevelId(levelId).setExperience(experience) ); } - @Override - public Long getUserCountByGroupId(Long groupId) { - return memberUserMapper.selectCountByGroupId(groupId); - } - - @Override - public Long getUserCountByLevelId(Long levelId) { - return memberUserMapper.selectCountByLevelId(levelId); - } - @Override public Long getUserCountByTagId(Long tagId) { return memberUserMapper.selectCountByTagId(tagId); diff --git a/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/service/user/UserMemberAddressService.java b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/service/user/UserMemberAddressService.java new file mode 100644 index 0000000..0a511bd --- /dev/null +++ b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/service/user/UserMemberAddressService.java @@ -0,0 +1,28 @@ +package com.tashow.cloud.user.service.user; + +import com.tashow.cloud.user.dal.dataobject.user.UserMemberAddressDO; + +/** + * 会员地址 Service 接口 + * + * @author 芋道源码 + */ +public interface UserMemberAddressService { + + /** + * 删除会员地址 + * + * @param id 编号 + */ + void deleteMemberAddress(Long id); + + /** + * 获得会员地址 + * + * @param id 编号 + * @return 会员地址 + */ + UserMemberAddressDO getMemberAddress(Long id); + + +} \ No newline at end of file diff --git a/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/service/user/UserMemberAddressServiceImpl.java b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/service/user/UserMemberAddressServiceImpl.java new file mode 100644 index 0000000..ed0b25f --- /dev/null +++ b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/service/user/UserMemberAddressServiceImpl.java @@ -0,0 +1,41 @@ +package com.tashow.cloud.user.service.user; + +import com.tashow.cloud.user.dal.dataobject.user.UserMemberAddressDO; +import com.tashow.cloud.user.dal.mysql.user.UserMemberAddressMapper; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; + +/** + * 会员地址 Service 实现类 + * + * @author 芋道源码 + */ +@Service +@Validated +public class UserMemberAddressServiceImpl implements UserMemberAddressService { + + @Resource + private UserMemberAddressMapper memberAddressMapper; + + + @Override + public void deleteMemberAddress(Long id) { + // 校验存在 + validateMemberAddressExists(id); + // 删除 + memberAddressMapper.deleteById(id); + } + + private void validateMemberAddressExists(Long id) { + if (memberAddressMapper.selectById(id) == null) { +// throw exception(MEMBER_ADDRESS_NOT_EXISTS); + } + } + + @Override + public UserMemberAddressDO getMemberAddress(Long id) { + return memberAddressMapper.selectById(id); + } + +} \ No newline at end of file diff --git a/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/service/user/UserMemberLevelService.java b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/service/user/UserMemberLevelService.java new file mode 100644 index 0000000..d3f77b1 --- /dev/null +++ b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/service/user/UserMemberLevelService.java @@ -0,0 +1,28 @@ +package com.tashow.cloud.user.service.user; + +import com.tashow.cloud.user.dal.dataobject.user.UserMemberLevelDO; + +/** + * 会员等级 Service 接口 + * + * @author 芋道源码 + */ +public interface UserMemberLevelService { + + + /** + * 删除会员等级 + * + * @param id 编号 + */ + void deleteMemberLevel(Long id); + + /** + * 获得会员等级 + * + * @param id 编号 + * @return 会员等级 + */ + UserMemberLevelDO getMemberLevel(Long id); + +} \ No newline at end of file diff --git a/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/service/user/UserMemberLevelServiceImpl.java b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/service/user/UserMemberLevelServiceImpl.java new file mode 100644 index 0000000..3d131f4 --- /dev/null +++ b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/service/user/UserMemberLevelServiceImpl.java @@ -0,0 +1,41 @@ +package com.tashow.cloud.user.service.user; + +import com.tashow.cloud.user.dal.dataobject.user.UserMemberLevelDO; +import com.tashow.cloud.user.dal.mysql.user.UserMemberLevelMapper; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; + +/** + * 会员等级 Service 实现类 + * + * @author 芋道源码 + */ +@Service +@Validated +public class UserMemberLevelServiceImpl implements UserMemberLevelService { + + @Resource + private UserMemberLevelMapper memberLevelMapper; + + + @Override + public void deleteMemberLevel(Long id) { + // 校验存在 + validateMemberLevelExists(id); + // 删除 + memberLevelMapper.deleteById(id); + } + + private void validateMemberLevelExists(Long id) { + if (memberLevelMapper.selectById(id) == null) { +// throw exception(MEMBER_LEVEL_NOT_EXISTS); + } + } + + @Override + public UserMemberLevelDO getMemberLevel(Long id) { + return memberLevelMapper.selectById(id); + } + +} \ No newline at end of file diff --git a/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/service/user/UserMemberService.java b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/service/user/UserMemberService.java new file mode 100644 index 0000000..d79dd58 --- /dev/null +++ b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/service/user/UserMemberService.java @@ -0,0 +1,29 @@ +package com.tashow.cloud.user.service.user; + +import com.tashow.cloud.user.dal.dataobject.user.UserMemberDO; + +/** + * 会员信息 Service 接口 + * + * @author 芋道源码 + */ +public interface UserMemberService { + + + /** + * 删除会员信息 + * + * @param id 编号 + */ + void deleteMember(Long id); + + /** + * 获得会员信息 + * + * @param id 编号 + * @return 会员信息 + */ + UserMemberDO getMember(Long id); + + +} \ No newline at end of file diff --git a/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/service/user/UserMemberServiceImpl.java b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/service/user/UserMemberServiceImpl.java new file mode 100644 index 0000000..1277e74 --- /dev/null +++ b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/service/user/UserMemberServiceImpl.java @@ -0,0 +1,41 @@ +package com.tashow.cloud.user.service.user; + +import com.tashow.cloud.user.dal.dataobject.user.UserMemberDO; +import com.tashow.cloud.user.dal.mysql.user.UserMemberMapper; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; + +/** + * 会员信息 Service 实现类 + * + * @author 芋道源码 + */ +@Service +@Validated +public class UserMemberServiceImpl implements UserMemberService { + + @Resource + private UserMemberMapper memberMapper; + + + @Override + public void deleteMember(Long id) { + // 校验存在 + validateMemberExists(id); + // 删除 + memberMapper.deleteById(id); + } + + private void validateMemberExists(Long id) { + if (memberMapper.selectById(id) == null) { +// throw exception(MEMBER_NOT_EXISTS); + } + } + + @Override + public UserMemberDO getMember(Long id) { + return memberMapper.selectById(id); + } + +} \ No newline at end of file diff --git a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/user/MemberUserApiImpl.java b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/user/MemberUserApiImpl.java similarity index 82% rename from tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/user/MemberUserApiImpl.java rename to tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/user/MemberUserApiImpl.java index 5ae28e6..c1ba9de 100644 --- a/tashow-module/tashow-module-member/src/main/java/com/tashow/cloud/member/user/MemberUserApiImpl.java +++ b/tashow-module/tashow-module-user/src/main/java/com/tashow/cloud/user/user/MemberUserApiImpl.java @@ -1,11 +1,11 @@ -package com.tashow.cloud.member.user; +package com.tashow.cloud.user.user; import com.tashow.cloud.common.pojo.CommonResult; import com.tashow.cloud.memberapi.api.user.MemberUserApi; import com.tashow.cloud.memberapi.api.user.dto.MemberUserRespDTO; -import com.tashow.cloud.member.convert.user.MemberUserConvert; -import com.tashow.cloud.member.dal.dataobject.user.MemberUserDO; -import com.tashow.cloud.member.service.user.MemberUserService; +import com.tashow.cloud.user.convert.user.MemberUserConvert; +import com.tashow.cloud.user.dal.dataobject.user.UserLoginDO; +import com.tashow.cloud.user.service.user.UserLoginService; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RestController; @@ -27,11 +27,11 @@ import static com.tashow.cloud.memberapi.enums.ErrorCodeConstants.USER_MOBILE_NO public class MemberUserApiImpl implements MemberUserApi { @Resource - private MemberUserService userService; + private UserLoginService userService; @Override public CommonResult getUser(Long id) { - MemberUserDO user = userService.getUser(id); + UserLoginDO user = userService.getUser(id); return success(MemberUserConvert.INSTANCE.convert2(user)); } @@ -52,7 +52,7 @@ public class MemberUserApiImpl implements MemberUserApi { @Override public CommonResult validateUser(Long id) { - MemberUserDO user = userService.getUser(id); + UserLoginDO user = userService.getUser(id); if (user == null) { throw exception(USER_MOBILE_NOT_EXISTS); } diff --git a/tashow-module/tashow-module-member/src/main/resources/application-local.yaml b/tashow-module/tashow-module-user/src/main/resources/application-local.yaml similarity index 81% rename from tashow-module/tashow-module-member/src/main/resources/application-local.yaml rename to tashow-module/tashow-module-user/src/main/resources/application-local.yaml index 80b237a..3aa0efb 100644 --- a/tashow-module/tashow-module-member/src/main/resources/application-local.yaml +++ b/tashow-module/tashow-module-user/src/main/resources/application-local.yaml @@ -3,9 +3,9 @@ spring: cloud: nacos: - server-addr: 127.0.0.1:8848 # Nacos 服务器地址 - username: # Nacos 账号 - password: # Nacos 密码 + server-addr: 43.139.42.137:8848 # Nacos 服务器地址 + username: nacos # Nacos 账号 + password: nacos # Nacos 密码 discovery: # 【配置中心】配置项 namespace: dev # 命名空间。这里使用 dev 开发环境 group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP diff --git a/tashow-module/tashow-module-member/src/main/resources/application.yaml b/tashow-module/tashow-module-user/src/main/resources/application.yaml similarity index 96% rename from tashow-module/tashow-module-member/src/main/resources/application.yaml rename to tashow-module/tashow-module-user/src/main/resources/application.yaml index f98b23c..59e031f 100644 --- a/tashow-module/tashow-module-member/src/main/resources/application.yaml +++ b/tashow-module/tashow-module-user/src/main/resources/application.yaml @@ -2,7 +2,7 @@ server: port: 48084 spring: application: - name: member-server + name: user-server profiles: active: local diff --git a/tashow-module/tashow-module-member/src/main/resources/logback-spring.xml b/tashow-module/tashow-module-user/src/main/resources/logback-spring.xml similarity index 100% rename from tashow-module/tashow-module-member/src/main/resources/logback-spring.xml rename to tashow-module/tashow-module-user/src/main/resources/logback-spring.xml