Skip to content

Commit

Permalink
开始迁移用户收件地址,清理部分代码~
Browse files Browse the repository at this point in the history
  • Loading branch information
YunaiV committed Jul 23, 2020
1 parent 25047e0 commit 6ae48b6
Show file tree
Hide file tree
Showing 37 changed files with 171 additions and 12,654 deletions.
Empty file added docs/sql/mall_user_schema.sql
Empty file.
11,600 changes: 0 additions & 11,600 deletions docs/sql/old/mall_user.sql

Large diffs are not rendered by default.

@@ -0,0 +1,39 @@
package cn.iocoder.mall.userservice.enums.address;

import cn.iocoder.common.framework.core.IntArrayValuable;

import java.util.Arrays;

/**
* 用户收件地址的类型枚举
*/
public enum UserAddressType implements IntArrayValuable {

DEFAULT(1, "默认收件地址"),
NORMAL(2, "普通收件地址"), // 即非默认收件笛之爱
;

public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(UserAddressType::getType).toArray();

private final Integer type;
private final String desc;

UserAddressType(Integer type, String desc) {
this.type = type;
this.desc = desc;
}

public Integer getType() {
return type;
}

public String getDesc() {
return desc;
}

@Override
public int[] array() {
return ARRAYS;
}

}
@@ -0,0 +1,59 @@
package cn.iocoder.mall.userservice.dal.mysql.dataobject.address;

import cn.iocoder.mall.mybatis.core.dataobject.DeletableDO;
import cn.iocoder.mall.userservice.enums.address.UserAddressType;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;

/**
* 用户收件地址
*
* @author Sin
* @time 2019-04-06 13:22
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
public class UsersUserAddressDO extends DeletableDO {

/**
* 编号
*/
private Integer id;
/**
* 用户编号
*/
private Integer userId;
/**
* 收件人名称
*/
private String name;
/**
* 收件手机号
*/
private String mobile;
/**
* 省份编号
*/
private Integer provinceCode;
/**
* 城市编号
*/
private Integer cityCode;
/**
* 区域编号
*/
private Integer countyCode;
/**
* 收件详细地址
*/
private String detailAddress;
/**
* 地址类型,主要分为默认地址,和普通地址
*
* 外键 {@link UserAddressType}
*/
private Integer type;

}
@@ -0,0 +1,73 @@
package cn.iocoder.mall.userservice.dal.mysql.dataobject.user;

import lombok.Data;
import lombok.experimental.Accessors;

import java.util.Date;

/**
* 用户三方开放平台授权,例如:QQ / 微博 / 微信等等。
*
* TODO 优化点:需要在改改
*/
@Data
@Accessors(chain = true)
public class UserThirdAuthDO {

/**
* 用户编号
*
* 外键 {@link UserDO#uid}
*/
private Long uid;

// ========== 授权相关字段

/**
* 用户的唯一标识
*/
private String openid;
/**
* 开放平台
*
* @see cn.iocoder.mall.user.api.constant.ThirdPlatformConstant
*/
private Integer platform;
/**
* 访问令牌
*/
private Date accessToken;
/**
* 过期时间
*/
private Date expireTime;
/**
* 刷新令牌
*/
private Date refreshToken;
/**
* 授权范围。一般情况下,使用逗号分隔
*/
private String scopes;

// ========== 基础信息
/**
* 用户昵称
*/
private String nickname;
/**
* 性别
*
* TODO 芋艿,找地方统一枚举。0-未知,1-男,2-女
*/
private Integer gender;
// TODO https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140842
// TODO 芋艿,其他字段,国家/省份/城市/地区等
// TODO 芋艿,头像
// TODO 芋艿,微信独有 unionid
/**
* 统一存储基础信息,使用 JSON 格式化,避免未有效解析的情况。
*/
private String extras;

}

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

0 comments on commit 6ae48b6

Please sign in to comment.