feat:用户tag

sql/mysql/recent/member_recent.sql

@@ -104,7 +104,7 @@ CREATE TABLE `member_photo`
     `id`             bigint      NOT NULL AUTO_INCREMENT COMMENT '用户相册id',
     `biz_type`       varchar(32) NOT NULL COMMENT '上传途径',
     `address`        bigint      NOT NULL COMMENT '资源地址',
-    `tag-json`       varchar(512)         DEFAULT NULL COMMENT 'tag-json',
+    `tag_json`       varchar(512)         DEFAULT NULL COMMENT 'tag_json',
     `issue_long`     double precision     DEFAULT NULL COMMENT '发布-经度',
     `issue_lat`      double precision     DEFAULT NULL COMMENT '发布-纬度',
     `issue_province` varchar(64)          DEFAULT NULL COMMENT '发布-省',
@@ -144,27 +144,23 @@ CREATE TABLE `member_location`
 ) ENGINE = InnoDB AUTO_INCREMENT = 32 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '用户位置记录';
 
 -- ----------------------------
--- Table structure for member_location
+-- Table structure for member_tag
 -- ----------------------------
-DROP TABLE IF EXISTS `member_location`;
-CREATE TABLE `member_location`
+DROP TABLE IF EXISTS `member_tag`;
+CREATE TABLE `member_tag`
 (
-    `id`          bigint   NOT NULL AUTO_INCREMENT COMMENT '会员id',
-    `long`        double precision  DEFAULT NULL COMMENT '经度',
-    `lat`         double precision  DEFAULT NULL COMMENT '纬度',
-    `province`    varchar(64)       DEFAULT NULL COMMENT '省',
-    `city`        varchar(64)       DEFAULT NULL COMMENT '市',
-    `district`    varchar(64)       DEFAULT NULL COMMENT '区',
-    `address`     varchar(256)      DEFAULT NULL COMMENT '详细地址',
+    `id`          bigint      NOT NULL AUTO_INCREMENT COMMENT '用户tagid',
+    `member_id`   bigint      NOT NULL COMMENT '人员id',
+    `tag_title`   varchar(64) NOT NULL COMMENT 'tag标题',
+    `tag_biz_id`  bigint               DEFAULT NULL COMMENT 'tag获取的对应id',
     `creator`     varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者',
-    `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `create_time` datetime    NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     `updater`     varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '更新者',
-    `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
-    `deleted`     bit(1)   NOT NULL DEFAULT b'0' COMMENT '是否删除',
-    `tenant_id`   bigint   NOT NULL DEFAULT 0 COMMENT '租户编号',
+    `update_time` datetime    NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+    `deleted`     bit(1)      NOT NULL DEFAULT b'0' COMMENT '是否删除',
+    `tenant_id`   bigint      NOT NULL DEFAULT 0 COMMENT '租户编号',
     PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 32 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '用户位置记录';
-
+) ENGINE = InnoDB AUTO_INCREMENT = 32 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '用户tag';
 
 -- ----------------------------
 -- Table structure for member_open_type

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/user/MemberTagDO.java

@@ -0,0 +1,41 @@
+package cn.iocoder.yudao.module.member.dal.dataobject.user;
+
+import lombok.*;
+import com.baomidou.mybatisplus.annotation.*;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+
+/**
+ * 用户tag DO
+ */
+@TableName("member_tag")
+@KeySequence("member_tag_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class MemberTagDO extends BaseDO {
+
+    /**
+     * 用户tagid
+     */
+    @TableId
+    private Long id;
+
+    /**
+     * 人员id
+     */
+    private Long memberId;
+
+    /**
+     * tag标题
+     */
+    private String tagTitle;
+
+    /**
+     * tag获取的对应id
+     */
+    private Long tagBizId;
+
+}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/user/MemberTagMapper.java

@@ -0,0 +1,13 @@
+package cn.iocoder.yudao.module.member.dal.mysql.user;
+
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberTagDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 用户tag Mapper
+ */
+@Mapper
+public interface MemberTagMapper extends BaseMapperX<MemberTagDO> {
+
+}

yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/wallet/vo/recharge/AppPayWalletRechargeCreateReqVO.java

@@ -5,6 +5,7 @@ import lombok.Data;
 
 import javax.validation.constraints.AssertTrue;
 import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
 import java.util.Objects;
 
 @Schema(description = "用户 APP - 创建钱包充值 Request VO")
@@ -15,6 +16,7 @@ public class AppPayWalletRechargeCreateReqVO {
     @Min(value = 1,  message = "支付金额必须大于零")
     private Integer payPrice;
 
+    @NotNull(message = "充值套餐编号不能为空")
     @Schema(description = "充值套餐编号", example = "1024")
     private Long packageId;