github/mall
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mbg生成model时自动生成swagger注解

Browse Source
This commit is contained in:
macro 2019-04-20 14:33:36 +08:00
parent 5262a232aa
commit 4afcba9f92
72 changed files with 465 additions and 1808 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
mall-mbg/src/main/java/com/macro/mall/CommentGenerator.java
View File

@ -2,7 +2,9 @@ package com.macro.mall;
import org.mybatis.generator.api.IntrospectedColumn;
import org.mybatis.generator.api.IntrospectedTable;
import org.mybatis.generator.api.dom.java.CompilationUnit;
import org.mybatis.generator.api.dom.java.Field;
import org.mybatis.generator.api.dom.java.FullyQualifiedJavaType;
import org.mybatis.generator.internal.DefaultCommentGenerator;
import org.mybatis.generator.internal.util.StringUtility;
@ -14,6 +16,8 @@ import java.util.Properties;
*/
public class CommentGenerator extends DefaultCommentGenerator {
private boolean addRemarkComments = false;
private static final String EXAMPLE_SUFFIX="Example";
private static final String API_MODEL_PROPERTY_FULL_CLASS_NAME="io.swagger.annotations.ApiModelProperty";
/**
* 设置用户配置的参数
@ -33,15 +37,37 @@ public class CommentGenerator extends DefaultCommentGenerator {
String remarks = introspectedColumn.getRemarks();
//根据参数和备注信息判断是否添加备注信息
if(addRemarkComments&&StringUtility.stringHasValue(remarks)){
//文档注释开始
field.addJavaDocLine("/**");
//获取数据库字段的备注信息
String[] remarkLines = remarks.split(System.getProperty("line.separator"));
for(String remarkLine:remarkLines){
field.addJavaDocLine(" * "+remarkLine);
// addFieldJavaDoc(field, remarks);
//数据库中特殊字符需要转义
if(remarks.contains("\"")){
remarks = remarks.replace("\"","'");
}
addJavadocTag(field, false);
field.addJavaDocLine(" */");
//给model的字段添加swagger注解
field.addJavaDocLine("@ApiModelProperty(value = \""+remarks+"\")");
}
}
/**
* 给model的字段添加注释
*/
private void addFieldJavaDoc(Field field, String remarks) {
//文档注释开始
field.addJavaDocLine("/**");
//获取数据库字段的备注信息
String[] remarkLines = remarks.split(System.getProperty("line.separator"));
for(String remarkLine:remarkLines){
field.addJavaDocLine(" * "+remarkLine);
}
addJavadocTag(field, false);
field.addJavaDocLine(" */");
}
@Override
public void addJavaFileComment(CompilationUnit compilationUnit) {
super.addJavaFileComment(compilationUnit);
//只在model中添加swagger注解类的导入
if(!compilationUnit.isJavaInterface()&&!compilationUnit.getType().getFullyQualifiedName().contains(EXAMPLE_SUFFIX)){
compilationUnit.addImportedType(new FullyQualifiedJavaType(API_MODEL_PROPERTY_FULL_CLASS_NAME));
}
}
}

1
mall-mbg/src/main/java/com/macro/mall/model/CmsHelp.java
View File

@ -1,5 +1,6 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;

13
mall-mbg/src/main/java/com/macro/mall/model/CmsHelpCategory.java
View File

@ -1,5 +1,6 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
public class CmsHelpCategory implements Serializable {
@ -7,18 +8,10 @@ public class CmsHelpCategory implements Serializable {
private String name;
/**
* 分类图标
*
* @mbggenerated
*/
@ApiModelProperty(value = "分类图标")
private String icon;
/**
* 专题数量
*
* @mbggenerated
*/
@ApiModelProperty(value = "专题数量")
private Integer helpCount;
private Integer showStatus;

25
mall-mbg/src/main/java/com/macro/mall/model/CmsMemberReport.java
View File

@ -1,41 +1,26 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
public class CmsMemberReport implements Serializable {
private Long id;
/**
* 举报类型：0->商品评价；1->话题内容；2->用户评论
*
* @mbggenerated
*/
@ApiModelProperty(value = "举报类型：0->商品评价；1->话题内容；2->用户评论")
private Integer reportType;
/**
* 举报人
*
* @mbggenerated
*/
@ApiModelProperty(value = "举报人")
private String reportMemberName;
private Date createTime;
private String reportObject;
/**
* 举报状态：0->未处理；1->已处理
*
* @mbggenerated
*/
@ApiModelProperty(value = "举报状态：0->未处理；1->已处理")
private Integer reportStatus;
/**
* 处理结果：0->无效；1->有效；2->恶意
*
* @mbggenerated
*/
@ApiModelProperty(value = "处理结果：0->无效；1->有效；2->恶意")
private Integer handleStatus;
private String note;

7
mall-mbg/src/main/java/com/macro/mall/model/CmsPrefrenceArea.java
View File

@ -1,5 +1,6 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
public class CmsPrefrenceArea implements Serializable {
@ -13,11 +14,7 @@ public class CmsPrefrenceArea implements Serializable {
private Integer showStatus;
/**
* 展示图片
*
* @mbggenerated
*/
@ApiModelProperty(value = "展示图片")
private byte[] pic;
private static final long serialVersionUID = 1L;

1
mall-mbg/src/main/java/com/macro/mall/model/CmsPrefrenceAreaProductRelation.java
View File

@ -1,5 +1,6 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
public class CmsPrefrenceAreaProductRelation implements Serializable {

37
mall-mbg/src/main/java/com/macro/mall/model/CmsSubject.java
View File

@ -1,5 +1,6 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
@ -10,18 +11,10 @@ public class CmsSubject implements Serializable {
private String title;
/**
* 专题主图
*
* @mbggenerated
*/
@ApiModelProperty(value = "专题主图")
private String pic;
/**
* 关联产品数量
*
* @mbggenerated
*/
@ApiModelProperty(value = "关联产品数量")
private Integer productCount;
private Integer recommendStatus;
@ -34,34 +27,18 @@ public class CmsSubject implements Serializable {
private Integer commentCount;
/**
* 画册图片用逗号分割
*
* @mbggenerated
*/
@ApiModelProperty(value = "画册图片用逗号分割")
private String albumPics;
private String description;
/**
* 显示状态：0->不显示；1->显示
*
* @mbggenerated
*/
@ApiModelProperty(value = "显示状态：0->不显示；1->显示")
private Integer showStatus;
/**
* 转发数
*
* @mbggenerated
*/
@ApiModelProperty(value = "转发数")
private Integer forwardCount;
/**
* 专题分类名称
*
* @mbggenerated
*/
@ApiModelProperty(value = "专题分类名称")
private String categoryName;
private String content;

13
mall-mbg/src/main/java/com/macro/mall/model/CmsSubjectCategory.java
View File

@ -1,5 +1,6 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
public class CmsSubjectCategory implements Serializable {
@ -7,18 +8,10 @@ public class CmsSubjectCategory implements Serializable {
private String name;
/**
* 分类图标
*
* @mbggenerated
*/
@ApiModelProperty(value = "分类图标")
private String icon;
/**
* 专题数量
*
* @mbggenerated
*/
@ApiModelProperty(value = "专题数量")
private Integer subjectCount;
private Integer showStatus;

1
mall-mbg/src/main/java/com/macro/mall/model/CmsSubjectComment.java
View File

@ -1,5 +1,6 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;

1
mall-mbg/src/main/java/com/macro/mall/model/CmsSubjectProductRelation.java
View File

@ -1,5 +1,6 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
public class CmsSubjectProductRelation implements Serializable {

31
mall-mbg/src/main/java/com/macro/mall/model/CmsTopic.java
View File

@ -1,5 +1,6 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
@ -16,41 +17,21 @@ public class CmsTopic implements Serializable {
private Date endTime;
/**
* 参与人数
*
* @mbggenerated
*/
@ApiModelProperty(value = "参与人数")
private Integer attendCount;
/**
* 关注人数
*
* @mbggenerated
*/
@ApiModelProperty(value = "关注人数")
private Integer attentionCount;
private Integer readCount;
/**
* 奖品名称
*
* @mbggenerated
*/
@ApiModelProperty(value = "奖品名称")
private String awardName;
/**
* 参与方式
*
* @mbggenerated
*/
@ApiModelProperty(value = "参与方式")
private String attendType;
/**
* 话题内容
*
* @mbggenerated
*/
@ApiModelProperty(value = "话题内容")
private String content;
private static final long serialVersionUID = 1L;

13
mall-mbg/src/main/java/com/macro/mall/model/CmsTopicCategory.java
View File

@ -1,5 +1,6 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
public class CmsTopicCategory implements Serializable {
@ -7,18 +8,10 @@ public class CmsTopicCategory implements Serializable {
private String name;
/**
* 分类图标
*
* @mbggenerated
*/
@ApiModelProperty(value = "分类图标")
private String icon;
/**
* 专题数量
*
* @mbggenerated
*/
@ApiModelProperty(value = "专题数量")
private Integer subjectCount;
private Integer showStatus;

1
mall-mbg/src/main/java/com/macro/mall/model/CmsTopicComment.java
View File

@ -1,5 +1,6 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;

91
mall-mbg/src/main/java/com/macro/mall/model/OmsCartItem.java
View File

@ -1,5 +1,6 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
@ -13,113 +14,53 @@ public class OmsCartItem implements Serializable {
private Long memberId;
/**
* 购买数量
*
* @mbggenerated
*/
@ApiModelProperty(value = "购买数量")
private Integer quantity;
/**
* 添加到购物车的价格
*
* @mbggenerated
*/
@ApiModelProperty(value = "添加到购物车的价格")
private BigDecimal price;
/**
* 销售属性1
*
* @mbggenerated
*/
@ApiModelProperty(value = "销售属性1")
private String sp1;
/**
* 销售属性2
*
* @mbggenerated
*/
@ApiModelProperty(value = "销售属性2")
private String sp2;
/**
* 销售属性3
*
* @mbggenerated
*/
@ApiModelProperty(value = "销售属性3")
private String sp3;
/**
* 商品主图
*
* @mbggenerated
*/
@ApiModelProperty(value = "商品主图")
private String productPic;
/**
* 商品名称
*
* @mbggenerated
*/
@ApiModelProperty(value = "商品名称")
private String productName;
/**
* 商品副标题（卖点）
*
* @mbggenerated
*/
@ApiModelProperty(value = "商品副标题（卖点）")
private String productSubTitle;
/**
* 商品sku条码
*
* @mbggenerated
*/
@ApiModelProperty(value = "商品sku条码")
private String productSkuCode;
/**
* 会员昵称
*
* @mbggenerated
*/
@ApiModelProperty(value = "会员昵称")
private String memberNickname;
/**
* 创建时间
*
* @mbggenerated
*/
@ApiModelProperty(value = "创建时间")
private Date createDate;
/**
* 修改时间
*
* @mbggenerated
*/
@ApiModelProperty(value = "修改时间")
private Date modifyDate;
/**
* 是否删除
*
* @mbggenerated
*/
@ApiModelProperty(value = "是否删除")
private Integer deleteStatus;
/**
* 商品分类
*
* @mbggenerated
*/
@ApiModelProperty(value = "商品分类")
private Long productCategoryId;
private String productBrand;
private String productSn;
/**
* 商品销售属性:[{"key":"颜色","value":"颜色"},{"key":"容量","value":"4G"}]
*
* @mbggenerated
*/
@ApiModelProperty(value = "商品销售属性:[{'key':'颜色','value':'颜色'},{'key':'容量','value':'4G'}]")
private String productAttr;
private static final long serialVersionUID = 1L;

55
mall-mbg/src/main/java/com/macro/mall/model/OmsCompanyAddress.java
View File

@ -1,71 +1,36 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
public class OmsCompanyAddress implements Serializable {
private Long id;
/**
* 地址名称
*
* @mbggenerated
*/
@ApiModelProperty(value = "地址名称")
private String addressName;
/**
* 默认发货地址：0->否；1->是
*
* @mbggenerated
*/
@ApiModelProperty(value = "默认发货地址：0->否；1->是")
private Integer sendStatus;
/**
* 是否默认收货地址：0->否；1->是
*
* @mbggenerated
*/
@ApiModelProperty(value = "是否默认收货地址：0->否；1->是")
private Integer receiveStatus;
/**
* 收发货人姓名
*
* @mbggenerated
*/
@ApiModelProperty(value = "收发货人姓名")
private String name;
/**
* 收货人电话
*
* @mbggenerated
*/
@ApiModelProperty(value = "收货人电话")
private String phone;
/**
* 省/直辖市
*
* @mbggenerated
*/
@ApiModelProperty(value = "省/直辖市")
private String province;
/**
* 市
*
* @mbggenerated
*/
@ApiModelProperty(value = "市")
private String city;
/**
* 区
*
* @mbggenerated
*/
@ApiModelProperty(value = "区")
private String region;
/**
* 详细地址
*
* @mbggenerated
*/
@ApiModelProperty(value = "详细地址")
private String detailAddress;
private static final long serialVersionUID = 1L;

253
mall-mbg/src/main/java/com/macro/mall/model/OmsOrder.java
View File

@ -1,306 +1,139 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
public class OmsOrder implements Serializable {
/**
* 订单id
*
* @mbggenerated
*/
@ApiModelProperty(value = "订单id")
private Long id;
private Long memberId;
private Long couponId;
/**
* 订单编号
*
* @mbggenerated
*/
@ApiModelProperty(value = "订单编号")
private String orderSn;
/**
* 提交时间
*
* @mbggenerated
*/
@ApiModelProperty(value = "提交时间")
private Date createTime;
/**
* 用户帐号
*
* @mbggenerated
*/
@ApiModelProperty(value = "用户帐号")
private String memberUsername;
/**
* 订单总金额
*
* @mbggenerated
*/
@ApiModelProperty(value = "订单总金额")
private BigDecimal totalAmount;
/**
* 应付金额（实际支付金额）
*
* @mbggenerated
*/
@ApiModelProperty(value = "应付金额（实际支付金额）")
private BigDecimal payAmount;
/**
* 运费金额
*
* @mbggenerated
*/
@ApiModelProperty(value = "运费金额")
private BigDecimal freightAmount;
/**
* 促销优化金额（促销价、满减、阶梯价）
*
* @mbggenerated
*/
@ApiModelProperty(value = "促销优化金额（促销价、满减、阶梯价）")
private BigDecimal promotionAmount;
/**
* 积分抵扣金额
*
* @mbggenerated
*/
@ApiModelProperty(value = "积分抵扣金额")
private BigDecimal integrationAmount;
/**
* 优惠券抵扣金额
*
* @mbggenerated
*/
@ApiModelProperty(value = "优惠券抵扣金额")
private BigDecimal couponAmount;
/**
* 管理员后台调整订单使用的折扣金额
*
* @mbggenerated
*/
@ApiModelProperty(value = "管理员后台调整订单使用的折扣金额")
private BigDecimal discountAmount;
/**
* 支付方式：0->未支付；1->支付宝；2->微信
*
* @mbggenerated
*/
@ApiModelProperty(value = "支付方式：0->未支付；1->支付宝；2->微信")
private Integer payType;
/**
* 订单来源：0->PC订单；1->app订单
*
* @mbggenerated
*/
@ApiModelProperty(value = "订单来源：0->PC订单；1->app订单")
private Integer sourceType;
/**
* 订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单
*
* @mbggenerated
*/
@ApiModelProperty(value = "订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单")
private Integer status;
/**
* 订单类型：0->正常订单；1->秒杀订单
*
* @mbggenerated
*/
@ApiModelProperty(value = "订单类型：0->正常订单；1->秒杀订单")
private Integer orderType;
/**
* 物流公司(配送方式)
*
* @mbggenerated
*/
@ApiModelProperty(value = "物流公司(配送方式)")
private String deliveryCompany;
/**
* 物流单号
*
* @mbggenerated
*/
@ApiModelProperty(value = "物流单号")
private String deliverySn;
/**
* 自动确认时间（天）
*
* @mbggenerated
*/
@ApiModelProperty(value = "自动确认时间（天）")
private Integer autoConfirmDay;
/**
* 可以获得的积分
*
* @mbggenerated
*/
@ApiModelProperty(value = "可以获得的积分")
private Integer integration;
/**
* 可以活动的成长值
*
* @mbggenerated
*/
@ApiModelProperty(value = "可以活动的成长值")
private Integer growth;
/**
* 活动信息
*
* @mbggenerated
*/
@ApiModelProperty(value = "活动信息")
private String promotionInfo;
/**
* 发票类型：0->不开发票；1->电子发票；2->纸质发票
*
* @mbggenerated
*/
@ApiModelProperty(value = "发票类型：0->不开发票；1->电子发票；2->纸质发票")
private Integer billType;
/**
* 发票抬头
*
* @mbggenerated
*/
@ApiModelProperty(value = "发票抬头")
private String billHeader;
/**
* 发票内容
*
* @mbggenerated
*/
@ApiModelProperty(value = "发票内容")
private String billContent;
/**
* 收票人电话
*
* @mbggenerated
*/
@ApiModelProperty(value = "收票人电话")
private String billReceiverPhone;
/**
* 收票人邮箱
*
* @mbggenerated
*/
@ApiModelProperty(value = "收票人邮箱")
private String billReceiverEmail;
/**
* 收货人姓名
*
* @mbggenerated
*/
@ApiModelProperty(value = "收货人姓名")
private String receiverName;
/**
* 收货人电话
*
* @mbggenerated
*/
@ApiModelProperty(value = "收货人电话")
private String receiverPhone;
/**
* 收货人邮编
*
* @mbggenerated
*/
@ApiModelProperty(value = "收货人邮编")
private String receiverPostCode;
/**
* 省份/直辖市
*
* @mbggenerated
*/
@ApiModelProperty(value = "省份/直辖市")
private String receiverProvince;
/**
* 城市
*
* @mbggenerated
*/
@ApiModelProperty(value = "城市")
private String receiverCity;
/**
* 区
*
* @mbggenerated
*/
@ApiModelProperty(value = "区")
private String receiverRegion;
/**
* 详细地址
*
* @mbggenerated
*/
@ApiModelProperty(value = "详细地址")
private String receiverDetailAddress;
/**
* 订单备注
*
* @mbggenerated
*/
@ApiModelProperty(value = "订单备注")
private String note;
/**
* 确认收货状态：0->未确认；1->已确认
*
* @mbggenerated
*/
@ApiModelProperty(value = "确认收货状态：0->未确认；1->已确认")
private Integer confirmStatus;
/**
* 删除状态：0->未删除；1->已删除
*
* @mbggenerated
*/
@ApiModelProperty(value = "删除状态：0->未删除；1->已删除")
private Integer deleteStatus;
/**
* 下单时使用的积分
*
* @mbggenerated
*/
@ApiModelProperty(value = "下单时使用的积分")
private Integer useIntegration;
/**
* 支付时间
*
* @mbggenerated
*/
@ApiModelProperty(value = "支付时间")
private Date paymentTime;
/**
* 发货时间
*
* @mbggenerated
*/
@ApiModelProperty(value = "发货时间")
private Date deliveryTime;
/**
* 确认收货时间
*
* @mbggenerated
*/
@ApiModelProperty(value = "确认收货时间")
private Date receiveTime;
/**
* 评价时间
*
* @mbggenerated
*/
@ApiModelProperty(value = "评价时间")
private Date commentTime;
/**
* 修改时间
*
* @mbggenerated
*/
@ApiModelProperty(value = "修改时间")
private Date modifyTime;
private static final long serialVersionUID = 1L;

85
mall-mbg/src/main/java/com/macro/mall/model/OmsOrderItem.java
View File

@ -1,23 +1,16 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.math.BigDecimal;
public class OmsOrderItem implements Serializable {
private Long id;
/**
* 订单id
*
* @mbggenerated
*/
@ApiModelProperty(value = "订单id")
private Long orderId;
/**
* 订单编号
*
* @mbggenerated
*/
@ApiModelProperty(value = "订单编号")
private String orderSn;
private Long productId;
@ -30,96 +23,48 @@ public class OmsOrderItem implements Serializable {
private String productSn;
/**
* 销售价格
*
* @mbggenerated
*/
@ApiModelProperty(value = "销售价格")
private BigDecimal productPrice;
/**
* 购买数量
*
* @mbggenerated
*/
@ApiModelProperty(value = "购买数量")
private Integer productQuantity;
/**
* 商品sku编号
*
* @mbggenerated
*/
@ApiModelProperty(value = "商品sku编号")
private Long productSkuId;
/**
* 商品sku条码
*
* @mbggenerated
*/
@ApiModelProperty(value = "商品sku条码")
private String productSkuCode;
/**
* 商品分类id
*
* @mbggenerated
*/
@ApiModelProperty(value = "商品分类id")
private Long productCategoryId;
/**
* 商品的销售属性
*
* @mbggenerated
*/
@ApiModelProperty(value = "商品的销售属性")
private String sp1;
private String sp2;
private String sp3;
/**
* 商品促销名称
*
* @mbggenerated
*/
@ApiModelProperty(value = "商品促销名称")
private String promotionName;
/**
* 商品促销分解金额
*
* @mbggenerated
*/
@ApiModelProperty(value = "商品促销分解金额")
private BigDecimal promotionAmount;
/**
* 优惠券优惠分解金额
*
* @mbggenerated
*/
@ApiModelProperty(value = "优惠券优惠分解金额")
private BigDecimal couponAmount;
/**
* 积分优惠分解金额
*
* @mbggenerated
*/
@ApiModelProperty(value = "积分优惠分解金额")
private BigDecimal integrationAmount;
/**
* 该商品经过优惠后的分解金额
*
* @mbggenerated
*/
@ApiModelProperty(value = "该商品经过优惠后的分解金额")
private BigDecimal realAmount;
private Integer giftIntegration;
private Integer giftGrowth;
/**
* 商品销售属性:[{"key":"颜色","value":"颜色"},{"key":"容量","value":"4G"}]
*
* @mbggenerated
*/
@ApiModelProperty(value = "商品销售属性:[{'key':'颜色','value':'颜色'},{'key':'容量','value':'4G'}]")
private String productAttr;
private static final long serialVersionUID = 1L;

31
mall-mbg/src/main/java/com/macro/mall/model/OmsOrderOperateHistory.java
View File

@ -1,44 +1,25 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
public class OmsOrderOperateHistory implements Serializable {
private Long id;
/**
* 订单id
*
* @mbggenerated
*/
@ApiModelProperty(value = "订单id")
private Long orderId;
/**
* 操作人：用户；系统；后台管理员
*
* @mbggenerated
*/
@ApiModelProperty(value = "操作人：用户；系统；后台管理员")
private String operateMan;
/**
* 操作时间
*
* @mbggenerated
*/
@ApiModelProperty(value = "操作时间")
private Date createTime;
/**
* 订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单
*
* @mbggenerated
*/
@ApiModelProperty(value = "订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单")
private Integer orderStatus;
/**
* 备注
*
* @mbggenerated
*/
@ApiModelProperty(value = "备注")
private String note;
private static final long serialVersionUID = 1L;

157
mall-mbg/src/main/java/com/macro/mall/model/OmsOrderReturnApply.java
View File

@ -1,5 +1,6 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
@ -7,186 +8,82 @@ import java.util.Date;
public class OmsOrderReturnApply implements Serializable {
private Long id;
/**
* 订单id
*
* @mbggenerated
*/
@ApiModelProperty(value = "订单id")
private Long orderId;
/**
* 收货地址表id
*
* @mbggenerated
*/
@ApiModelProperty(value = "收货地址表id")
private Long companyAddressId;
/**
* 退货商品id
*
* @mbggenerated
*/
@ApiModelProperty(value = "退货商品id")
private Long productId;
/**
* 订单编号
*
* @mbggenerated
*/
@ApiModelProperty(value = "订单编号")
private String orderSn;
/**
* 申请时间
*
* @mbggenerated
*/
@ApiModelProperty(value = "申请时间")
private Date createTime;
/**
* 会员用户名
*
* @mbggenerated
*/
@ApiModelProperty(value = "会员用户名")
private String memberUsername;
/**
* 退款金额
*
* @mbggenerated
*/
@ApiModelProperty(value = "退款金额")
private BigDecimal returnAmount;
/**
* 退货人姓名
*
* @mbggenerated
*/
@ApiModelProperty(value = "退货人姓名")
private String returnName;
/**
* 退货人电话
*
* @mbggenerated
*/
@ApiModelProperty(value = "退货人电话")
private String returnPhone;
/**
* 申请状态：0->待处理；1->退货中；2->已完成；3->已拒绝
*
* @mbggenerated
*/
@ApiModelProperty(value = "申请状态：0->待处理；1->退货中；2->已完成；3->已拒绝")
private Integer status;
/**
* 处理时间
*
* @mbggenerated
*/
@ApiModelProperty(value = "处理时间")
private Date handleTime;
/**
* 商品图片
*
* @mbggenerated
*/
@ApiModelProperty(value = "商品图片")
private String productPic;
/**
* 商品名称
*
* @mbggenerated
*/
@ApiModelProperty(value = "商品名称")
private String productName;
/**
* 商品品牌
*
* @mbggenerated
*/
@ApiModelProperty(value = "商品品牌")
private String productBrand;
/**
* 商品销售属性：颜色：红色；尺码：xl;
*
* @mbggenerated
*/
@ApiModelProperty(value = "商品销售属性：颜色：红色；尺码：xl;")
private String productAttr;
/**
* 退货数量
*
* @mbggenerated
*/
@ApiModelProperty(value = "退货数量")
private Integer productCount;
/**
* 商品单价
*
* @mbggenerated
*/
@ApiModelProperty(value = "商品单价")
private BigDecimal productPrice;
/**
* 商品实际支付单价
*
* @mbggenerated
*/
@ApiModelProperty(value = "商品实际支付单价")
private BigDecimal productRealPrice;
/**
* 原因
*
* @mbggenerated
*/
@ApiModelProperty(value = "原因")
private String reason;
/**
* 描述
*
* @mbggenerated
*/
@ApiModelProperty(value = "描述")
private String description;
/**
* 凭证图片，以逗号隔开
*
* @mbggenerated
*/
@ApiModelProperty(value = "凭证图片，以逗号隔开")
private String proofPics;
/**
* 处理备注
*
* @mbggenerated
*/
@ApiModelProperty(value = "处理备注")
private String handleNote;
/**
* 处理人员
*
* @mbggenerated
*/
@ApiModelProperty(value = "处理人员")
private String handleMan;
/**
* 收货人
*
* @mbggenerated
*/
@ApiModelProperty(value = "收货人")
private String receiveMan;
/**
* 收货时间
*
* @mbggenerated
*/
@ApiModelProperty(value = "收货时间")
private Date receiveTime;
/**
* 收货备注
*
* @mbggenerated
*/
@ApiModelProperty(value = "收货备注")
private String receiveNote;
private static final long serialVersionUID = 1L;

19
mall-mbg/src/main/java/com/macro/mall/model/OmsOrderReturnReason.java
View File

@ -1,32 +1,21 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
public class OmsOrderReturnReason implements Serializable {
private Long id;
/**
* 退货类型
*
* @mbggenerated
*/
@ApiModelProperty(value = "退货类型")
private String name;
private Integer sort;
/**
* 状态：0->不启用；1->启用
*
* @mbggenerated
*/
@ApiModelProperty(value = "状态：0->不启用；1->启用")
private Integer status;
/**
* 添加时间
*
* @mbggenerated
*/
@ApiModelProperty(value = "添加时间")
private Date createTime;
private static final long serialVersionUID = 1L;

31
mall-mbg/src/main/java/com/macro/mall/model/OmsOrderSetting.java
View File

@ -1,43 +1,24 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
public class OmsOrderSetting implements Serializable {
private Long id;
/**
* 秒杀订单超时关闭时间(分)
*
* @mbggenerated
*/
@ApiModelProperty(value = "秒杀订单超时关闭时间(分)")
private Integer flashOrderOvertime;
/**
* 正常订单超时时间(分)
*
* @mbggenerated
*/
@ApiModelProperty(value = "正常订单超时时间(分)")
private Integer normalOrderOvertime;
/**
* 发货后自动确认收货时间（天）
*
* @mbggenerated
*/
@ApiModelProperty(value = "发货后自动确认收货时间（天）")
private Integer confirmOvertime;
/**
* 自动完成交易时间，不能申请售后（天）
*
* @mbggenerated
*/
@ApiModelProperty(value = "自动完成交易时间，不能申请售后（天）")
private Integer finishOvertime;
/**
* 订单完成后自动好评时间（天）
*
* @mbggenerated
*/
@ApiModelProperty(value = "订单完成后自动好评时间（天）")
private Integer commentOvertime;
private static final long serialVersionUID = 1L;

1
mall-mbg/src/main/java/com/macro/mall/model/PmsAlbum.java
View File

@ -1,5 +1,6 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
public class PmsAlbum implements Serializable {

1
mall-mbg/src/main/java/com/macro/mall/model/PmsAlbumPic.java
View File

@ -1,5 +1,6 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
public class PmsAlbumPic implements Serializable {

43
mall-mbg/src/main/java/com/macro/mall/model/PmsBrand.java
View File

@ -1,5 +1,6 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
public class PmsBrand implements Serializable {
@ -7,57 +8,29 @@ public class PmsBrand implements Serializable {
private String name;
/**
* 首字母
*
* @mbggenerated
*/
@ApiModelProperty(value = "首字母")
private String firstLetter;
private Integer sort;
/**
* 是否为品牌制造商：0->不是；1->是
*
* @mbggenerated
*/
@ApiModelProperty(value = "是否为品牌制造商：0->不是；1->是")
private Integer factoryStatus;
private Integer showStatus;
/**
* 产品数量
*
* @mbggenerated
*/
@ApiModelProperty(value = "产品数量")
private Integer productCount;
/**
* 产品评论数量
*
* @mbggenerated
*/
@ApiModelProperty(value = "产品评论数量")
private Integer productCommentCount;
/**
* 品牌logo
*
* @mbggenerated
*/
@ApiModelProperty(value = "品牌logo")
private String logo;
/**
* 专区大图
*
* @mbggenerated
*/
@ApiModelProperty(value = "专区大图")
private String bigPic;
/**
* 品牌故事
*
* @mbggenerated
*/
@ApiModelProperty(value = "品牌故事")
private String brandStory;
private static final long serialVersionUID = 1L;

31
mall-mbg/src/main/java/com/macro/mall/model/PmsComment.java
View File

@ -1,5 +1,6 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
@ -12,47 +13,27 @@ public class PmsComment implements Serializable {
private String productName;
/**
* 评价星数：0->5
*
* @mbggenerated
*/
@ApiModelProperty(value = "评价星数：0->5")
private Integer star;
/**
* 评价的ip
*
* @mbggenerated
*/
@ApiModelProperty(value = "评价的ip")
private String memberIp;
private Date createTime;
private Integer showStatus;
/**
* 购买时的商品属性
*
* @mbggenerated
*/
@ApiModelProperty(value = "购买时的商品属性")
private String productAttribute;
private Integer collectCouont;
private Integer readCount;
/**
* 上传图片地址，以逗号隔开
*
* @mbggenerated
*/
@ApiModelProperty(value = "上传图片地址，以逗号隔开")
private String pics;
/**
* 评论用户头像
*
* @mbggenerated
*/
@ApiModelProperty(value = "评论用户头像")
private String memberIcon;
private Integer replayCount;

7
mall-mbg/src/main/java/com/macro/mall/model/PmsCommentReplay.java
View File

@ -1,5 +1,6 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
@ -16,11 +17,7 @@ public class PmsCommentReplay implements Serializable {
private Date createTime;
/**
* 评论人员类型；0->会员；1->管理员
*
* @mbggenerated
*/
@ApiModelProperty(value = "评论人员类型；0->会员；1->管理员")
private Integer type;
private static final long serialVersionUID = 1L;

25
mall-mbg/src/main/java/com/macro/mall/model/PmsFeightTemplate.java
View File

@ -1,5 +1,6 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.math.BigDecimal;
@ -8,36 +9,20 @@ public class PmsFeightTemplate implements Serializable {
private String name;
/**
* 计费类型:0->按重量；1->按件数
*
* @mbggenerated
*/
@ApiModelProperty(value = "计费类型:0->按重量；1->按件数")
private Integer chargeType;
/**
* 首重kg
*
* @mbggenerated
*/
@ApiModelProperty(value = "首重kg")
private BigDecimal firstWeight;
/**
* 首费（元）
*
* @mbggenerated
*/
@ApiModelProperty(value = "首费（元）")
private BigDecimal firstFee;
private BigDecimal continueWeight;
private BigDecimal continmeFee;
/**
* 目的地（省、市）
*
* @mbggenerated
*/
@ApiModelProperty(value = "目的地（省、市）")
private String dest;
private static final long serialVersionUID = 1L;

7
mall-mbg/src/main/java/com/macro/mall/model/PmsMemberPrice.java
View File

@ -1,5 +1,6 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.math.BigDecimal;
@ -10,11 +11,7 @@ public class PmsMemberPrice implements Serializable {
private Long memberLevelId;
/**
* 会员价格
*
* @mbggenerated
*/
@ApiModelProperty(value = "会员价格")
private BigDecimal memberPrice;
private String memberLevelName;

181
mall-mbg/src/main/java/com/macro/mall/model/PmsProduct.java
View File

@ -1,5 +1,6 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
@ -19,224 +20,104 @@ public class PmsProduct implements Serializable {
private String pic;
/**
* 货号
*
* @mbggenerated
*/
@ApiModelProperty(value = "货号")
private String productSn;
/**
* 删除状态：0->未删除；1->已删除
*
* @mbggenerated
*/
@ApiModelProperty(value = "删除状态：0->未删除；1->已删除")
private Integer deleteStatus;
/**
* 上架状态：0->下架；1->上架
*
* @mbggenerated
*/
@ApiModelProperty(value = "上架状态：0->下架；1->上架")
private Integer publishStatus;
/**
* 新品状态:0->不是新品；1->新品
*
* @mbggenerated
*/
@ApiModelProperty(value = "新品状态:0->不是新品；1->新品")
private Integer newStatus;
/**
* 推荐状态；0->不推荐；1->推荐
*
* @mbggenerated
*/
@ApiModelProperty(value = "推荐状态；0->不推荐；1->推荐")
private Integer recommandStatus;
/**
* 审核状态：0->未审核；1->审核通过
*
* @mbggenerated
*/
@ApiModelProperty(value = "审核状态：0->未审核；1->审核通过")
private Integer verifyStatus;
/**
* 排序
*
* @mbggenerated
*/
@ApiModelProperty(value = "排序")
private Integer sort;
/**
* 销量
*
* @mbggenerated
*/
@ApiModelProperty(value = "销量")
private Integer sale;
private BigDecimal price;
/**
* 促销价格
*
* @mbggenerated
*/
@ApiModelProperty(value = "促销价格")
private BigDecimal promotionPrice;
/**
* 赠送的成长值
*
* @mbggenerated
*/
@ApiModelProperty(value = "赠送的成长值")
private Integer giftGrowth;
/**
* 赠送的积分
*
* @mbggenerated
*/
@ApiModelProperty(value = "赠送的积分")
private Integer giftPoint;
/**
* 限制使用的积分数
*
* @mbggenerated
*/
@ApiModelProperty(value = "限制使用的积分数")
private Integer usePointLimit;
/**
* 副标题
*
* @mbggenerated
*/
@ApiModelProperty(value = "副标题")
private String subTitle;
/**
* 市场价
*
* @mbggenerated
*/
@ApiModelProperty(value = "市场价")
private BigDecimal originalPrice;
/**
* 库存
*
* @mbggenerated
*/
@ApiModelProperty(value = "库存")
private Integer stock;
/**
* 库存预警值
*
* @mbggenerated
*/
@ApiModelProperty(value = "库存预警值")
private Integer lowStock;
/**
* 单位
*
* @mbggenerated
*/
@ApiModelProperty(value = "单位")
private String unit;
/**
* 商品重量，默认为克
*
* @mbggenerated
*/
@ApiModelProperty(value = "商品重量，默认为克")
private BigDecimal weight;
/**
* 是否为预告商品：0->不是；1->是
*
* @mbggenerated
*/
@ApiModelProperty(value = "是否为预告商品：0->不是；1->是")
private Integer previewStatus;
/**
* 以逗号分割的产品服务：1->无忧退货；2->快速退款；3->免费包邮
*
* @mbggenerated
*/
@ApiModelProperty(value = "以逗号分割的产品服务：1->无忧退货；2->快速退款；3->免费包邮")
private String serviceIds;
private String keywords;
private String note;
/**
* 画册图片，连产品图片限制为5张，以逗号分割
*
* @mbggenerated
*/
@ApiModelProperty(value = "画册图片，连产品图片限制为5张，以逗号分割")
private String albumPics;
private String detailTitle;
/**
* 促销开始时间
*
* @mbggenerated
*/
@ApiModelProperty(value = "促销开始时间")
private Date promotionStartTime;
/**
* 促销结束时间
*
* @mbggenerated
*/
@ApiModelProperty(value = "促销结束时间")
private Date promotionEndTime;
/**
* 活动限购数量
*
* @mbggenerated
*/
@ApiModelProperty(value = "活动限购数量")
private Integer promotionPerLimit;
/**
* 促销类型：0->没有促销使用原价;1->使用促销价；2->使用会员价；3->使用阶梯价格；4->使用满减价格；5->限时购
*
* @mbggenerated
*/
@ApiModelProperty(value = "促销类型：0->没有促销使用原价;1->使用促销价；2->使用会员价；3->使用阶梯价格；4->使用满减价格；5->限时购")
private Integer promotionType;
/**
* 品牌名称
*
* @mbggenerated
*/
@ApiModelProperty(value = "品牌名称")
private String brandName;
/**
* 商品分类名称
*
* @mbggenerated
*/
@ApiModelProperty(value = "商品分类名称")
private String productCategoryName;
/**
* 商品描述
*
* @mbggenerated
*/
@ApiModelProperty(value = "商品描述")
private String description;
private String detailDesc;
/**
* 产品详情网页内容
*
* @mbggenerated
*/
@ApiModelProperty(value = "产品详情网页内容")
private String detailHtml;
/**
* 移动端网页详情
*
* @mbggenerated
*/
@ApiModelProperty(value = "移动端网页详情")
private String detailMobileHtml;
private static final long serialVersionUID = 1L;

55
mall-mbg/src/main/java/com/macro/mall/model/PmsProductAttribute.java
View File

@ -1,5 +1,6 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
public class PmsProductAttribute implements Serializable {
@ -9,67 +10,31 @@ public class PmsProductAttribute implements Serializable {
private String name;
/**
* 属性选择类型：0->唯一；1->单选；2->多选
*
* @mbggenerated
*/
@ApiModelProperty(value = "属性选择类型：0->唯一；1->单选；2->多选")
private Integer selectType;
/**
* 属性录入方式：0->手工录入；1->从列表中选取
*
* @mbggenerated
*/
@ApiModelProperty(value = "属性录入方式：0->手工录入；1->从列表中选取")
private Integer inputType;
/**
* 可选值列表，以逗号隔开
*
* @mbggenerated
*/
@ApiModelProperty(value = "可选值列表，以逗号隔开")
private String inputList;
/**
* 排序字段：最高的可以单独上传图片
*
* @mbggenerated
*/
@ApiModelProperty(value = "排序字段：最高的可以单独上传图片")
private Integer sort;
/**
* 分类筛选样式：1->普通；1->颜色
*
* @mbggenerated
*/
@ApiModelProperty(value = "分类筛选样式：1->普通；1->颜色")
private Integer filterType;
/**
* 检索类型；0->不需要进行检索；1->关键字检索；2->范围检索
*
* @mbggenerated
*/
@ApiModelProperty(value = "检索类型；0->不需要进行检索；1->关键字检索；2->范围检索")
private Integer searchType;
/**
* 相同属性产品是否关联；0->不关联；1->关联
*
* @mbggenerated
*/
@ApiModelProperty(value = "相同属性产品是否关联；0->不关联；1->关联")
private Integer relatedStatus;
/**
* 是否支持手动新增；0->不支持；1->支持
*
* @mbggenerated
*/
@ApiModelProperty(value = "是否支持手动新增；0->不支持；1->支持")
private Integer handAddStatus;
/**
* 属性的类型；0->规格；1->参数
*
* @mbggenerated
*/
@ApiModelProperty(value = "属性的类型；0->规格；1->参数")
private Integer type;
private static final long serialVersionUID = 1L;

13
mall-mbg/src/main/java/com/macro/mall/model/PmsProductAttributeCategory.java
View File

@ -1,5 +1,6 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
public class PmsProductAttributeCategory implements Serializable {
@ -7,18 +8,10 @@ public class PmsProductAttributeCategory implements Serializable {
private String name;
/**
* 属性数量
*
* @mbggenerated
*/
@ApiModelProperty(value = "属性数量")
private Integer attributeCount;
/**
* 参数数量
*
* @mbggenerated
*/
@ApiModelProperty(value = "参数数量")
private Integer paramCount;
private static final long serialVersionUID = 1L;

7
mall-mbg/src/main/java/com/macro/mall/model/PmsProductAttributeValue.java
View File

@ -1,5 +1,6 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
public class PmsProductAttributeValue implements Serializable {
@ -9,11 +10,7 @@ public class PmsProductAttributeValue implements Serializable {
private Long productAttributeId;
/**
* 手动添加规格或参数的值，参数单值，规格有多个时以逗号隔开
*
* @mbggenerated
*/
@ApiModelProperty(value = "手动添加规格或参数的值，参数单值，规格有多个时以逗号隔开")
private String value;
private static final long serialVersionUID = 1L;

37
mall-mbg/src/main/java/com/macro/mall/model/PmsProductCategory.java
View File

@ -1,60 +1,37 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
public class PmsProductCategory implements Serializable {
private Long id;
/**
* 上机分类的编号：0表示一级分类
*
* @mbggenerated
*/
@ApiModelProperty(value = "上机分类的编号：0表示一级分类")
private Long parentId;
private String name;
/**
* 分类级别：0->1级；1->2级
*
* @mbggenerated
*/
@ApiModelProperty(value = "分类级别：0->1级；1->2级")
private Integer level;
private Integer productCount;
private String productUnit;
/**
* 是否显示在导航栏：0->不显示；1->显示
*
* @mbggenerated
*/
@ApiModelProperty(value = "是否显示在导航栏：0->不显示；1->显示")
private Integer navStatus;
/**
* 显示状态：0->不显示；1->显示
*
* @mbggenerated
*/
@ApiModelProperty(value = "显示状态：0->不显示；1->显示")
private Integer showStatus;
private Integer sort;
/**
* 图标
*
* @mbggenerated
*/
@ApiModelProperty(value = "图标")
private String icon;
private String keywords;
/**
* 描述
*
* @mbggenerated
*/
@ApiModelProperty(value = "描述")
private String description;
private static final long serialVersionUID = 1L;

1
mall-mbg/src/main/java/com/macro/mall/model/PmsProductCategoryAttributeRelation.java
View File

@ -1,5 +1,6 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
public class PmsProductCategoryAttributeRelation implements Serializable {

1
mall-mbg/src/main/java/com/macro/mall/model/PmsProductFullReduction.java
View File

@ -1,5 +1,6 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.math.BigDecimal;

19
mall-mbg/src/main/java/com/macro/mall/model/PmsProductLadder.java
View File

@ -1,5 +1,6 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.math.BigDecimal;
@ -8,25 +9,13 @@ public class PmsProductLadder implements Serializable {
private Long productId;
/**
* 满足的商品数量
*
* @mbggenerated
*/
@ApiModelProperty(value = "满足的商品数量")
private Integer count;
/**
* 折扣
*
* @mbggenerated
*/
@ApiModelProperty(value = "折扣")
private BigDecimal discount;
/**
* 折后价格
*
* @mbggenerated
*/
@ApiModelProperty(value = "折后价格")
private BigDecimal price;
private static final long serialVersionUID = 1L;

13
mall-mbg/src/main/java/com/macro/mall/model/PmsProductOperateLog.java
View File

@ -1,5 +1,6 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
@ -17,11 +18,7 @@ public class PmsProductOperateLog implements Serializable {
private BigDecimal salePriceNew;
/**
* 赠送的积分
*
* @mbggenerated
*/
@ApiModelProperty(value = "赠送的积分")
private Integer giftPointOld;
private Integer giftPointNew;
@ -30,11 +27,7 @@ public class PmsProductOperateLog implements Serializable {
private Integer usePointLimitNew;
/**
* 操作人
*
* @mbggenerated
*/
@ApiModelProperty(value = "操作人")
private String operateMan;
private Date createTime;

13
mall-mbg/src/main/java/com/macro/mall/model/PmsProductVertifyRecord.java
View File

@ -1,5 +1,6 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
@ -10,20 +11,12 @@ public class PmsProductVertifyRecord implements Serializable {
private Date createTime;
/**
* 审核人
*
* @mbggenerated
*/
@ApiModelProperty(value = "审核人")
private String vertifyMan;
private Integer status;
/**
* 反馈详情
*
* @mbggenerated
*/
@ApiModelProperty(value = "反馈详情")
private String detail;
private static final long serialVersionUID = 1L;

49
mall-mbg/src/main/java/com/macro/mall/model/PmsSkuStock.java
View File

@ -1,5 +1,6 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.math.BigDecimal;
@ -8,66 +9,34 @@ public class PmsSkuStock implements Serializable {
private Long productId;
/**
* sku编码
*
* @mbggenerated
*/
@ApiModelProperty(value = "sku编码")
private String skuCode;
private BigDecimal price;
/**
* 库存
*
* @mbggenerated
*/
@ApiModelProperty(value = "库存")
private Integer stock;
/**
* 预警库存
*
* @mbggenerated
*/
@ApiModelProperty(value = "预警库存")
private Integer lowStock;
/**
* 销售属性1
*
* @mbggenerated
*/
@ApiModelProperty(value = "销售属性1")
private String sp1;
private String sp2;
private String sp3;
/**
* 展示图片
*
* @mbggenerated
*/
@ApiModelProperty(value = "展示图片")
private String pic;
/**
* 销量
*
* @mbggenerated
*/
@ApiModelProperty(value = "销量")
private Integer sale;
/**
* 单品促销价格
*
* @mbggenerated
*/
@ApiModelProperty(value = "单品促销价格")
private BigDecimal promotionPrice;
/**
* 锁定库存
*
* @mbggenerated
*/
@ApiModelProperty(value = "锁定库存")
private Integer lockStock;
private static final long serialVersionUID = 1L;

85
mall-mbg/src/main/java/com/macro/mall/model/SmsCoupon.java
View File

@ -1,5 +1,6 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
@ -7,108 +8,52 @@ import java.util.Date;
public class SmsCoupon implements Serializable {
private Long id;
/**
* 优惠卷类型；0->全场赠券；1->会员赠券；2->购物赠券；3->注册赠券
*
* @mbggenerated
*/
@ApiModelProperty(value = "优惠卷类型；0->全场赠券；1->会员赠券；2->购物赠券；3->注册赠券")
private Integer type;
private String name;
/**
* 使用平台：0->全部；1->移动；2->PC
*
* @mbggenerated
*/
@ApiModelProperty(value = "使用平台：0->全部；1->移动；2->PC")
private Integer platform;
/**
* 数量
*
* @mbggenerated
*/
@ApiModelProperty(value = "数量")
private Integer count;
/**
* 金额
*
* @mbggenerated
*/
@ApiModelProperty(value = "金额")
private BigDecimal amount;
/**
* 每人限领张数
*
* @mbggenerated
*/
@ApiModelProperty(value = "每人限领张数")
private Integer perLimit;
/**
* 使用门槛；0表示无门槛
*
* @mbggenerated
*/
@ApiModelProperty(value = "使用门槛；0表示无门槛")
private BigDecimal minPoint;
private Date startTime;
private Date endTime;
/**
* 使用类型：0->全场通用；1->指定分类；2->指定商品
*
* @mbggenerated
*/
@ApiModelProperty(value = "使用类型：0->全场通用；1->指定分类；2->指定商品")
private Integer useType;
/**
* 备注
*
* @mbggenerated
*/
@ApiModelProperty(value = "备注")
private String note;
/**
* 发行数量
*
* @mbggenerated
*/
@ApiModelProperty(value = "发行数量")
private Integer publishCount;
/**
* 已使用数量
*
* @mbggenerated
*/
@ApiModelProperty(value = "已使用数量")
private Integer useCount;
/**
* 领取数量
*
* @mbggenerated
*/
@ApiModelProperty(value = "领取数量")
private Integer receiveCount;
/**
* 可以领取的日期
*
* @mbggenerated
*/
@ApiModelProperty(value = "可以领取的日期")
private Date enableTime;
/**
* 优惠码
*
* @mbggenerated
*/
@ApiModelProperty(value = "优惠码")
private String code;
/**
* 可领取的会员类型：0->无限时
*
* @mbggenerated
*/
@ApiModelProperty(value = "可领取的会员类型：0->无限时")
private Integer memberLevel;
private static final long serialVersionUID = 1L;

37
mall-mbg/src/main/java/com/macro/mall/model/SmsCouponHistory.java
View File

@ -1,5 +1,6 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
@ -12,48 +13,24 @@ public class SmsCouponHistory implements Serializable {
private String couponCode;
/**
* 领取人昵称
*
* @mbggenerated
*/
@ApiModelProperty(value = "领取人昵称")
private String memberNickname;
/**
* 获取类型：0->后台赠送；1->主动获取
*
* @mbggenerated
*/
@ApiModelProperty(value = "获取类型：0->后台赠送；1->主动获取")
private Integer getType;
private Date createTime;
/**
* 使用状态：0->未使用；1->已使用；2->已过期
*
* @mbggenerated
*/
@ApiModelProperty(value = "使用状态：0->未使用；1->已使用；2->已过期")
private Integer useStatus;
/**
* 使用时间
*
* @mbggenerated
*/
@ApiModelProperty(value = "使用时间")
private Date useTime;
/**
* 订单编号
*
* @mbggenerated
*/
@ApiModelProperty(value = "订单编号")
private Long orderId;
/**
* 订单号码
*
* @mbggenerated
*/
@ApiModelProperty(value = "订单号码")
private String orderSn;
private static final long serialVersionUID = 1L;

13
mall-mbg/src/main/java/com/macro/mall/model/SmsCouponProductCategoryRelation.java
View File

@ -1,5 +1,6 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
public class SmsCouponProductCategoryRelation implements Serializable {
@ -9,18 +10,10 @@ public class SmsCouponProductCategoryRelation implements Serializable {
private Long productCategoryId;
/**
* 产品分类名称
*
* @mbggenerated
*/
@ApiModelProperty(value = "产品分类名称")
private String productCategoryName;
/**
* 父分类名称
*
* @mbggenerated
*/
@ApiModelProperty(value = "父分类名称")
private String parentCategoryName;
private static final long serialVersionUID = 1L;

13
mall-mbg/src/main/java/com/macro/mall/model/SmsCouponProductRelation.java
View File

@ -1,5 +1,6 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
public class SmsCouponProductRelation implements Serializable {
@ -9,18 +10,10 @@ public class SmsCouponProductRelation implements Serializable {
private Long productId;
/**
* 商品名称
*
* @mbggenerated
*/
@ApiModelProperty(value = "商品名称")
private String productName;
/**
* 商品编码
*
* @mbggenerated
*/
@ApiModelProperty(value = "商品编码")
private String productSn;
private static final long serialVersionUID = 1L;

25
mall-mbg/src/main/java/com/macro/mall/model/SmsFlashPromotion.java
View File

@ -1,5 +1,6 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
@ -8,32 +9,16 @@ public class SmsFlashPromotion implements Serializable {
private String title;
/**
* 开始日期
*
* @mbggenerated
*/
@ApiModelProperty(value = "开始日期")
private Date startDate;
/**
* 结束日期
*
* @mbggenerated
*/
@ApiModelProperty(value = "结束日期")
private Date endDate;
/**
* 上下线状态
*
* @mbggenerated
*/
@ApiModelProperty(value = "上下线状态")
private Integer status;
/**
* 秒杀时间段名称
*
* @mbggenerated
*/
@ApiModelProperty(value = "秒杀时间段名称")
private Date createTime;
private static final long serialVersionUID = 1L;

7
mall-mbg/src/main/java/com/macro/mall/model/SmsFlashPromotionLog.java
View File

@ -1,5 +1,6 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
@ -14,11 +15,7 @@ public class SmsFlashPromotionLog implements Serializable {
private String productName;
/**
* 会员订阅时间
*
* @mbggenerated
*/
@ApiModelProperty(value = "会员订阅时间")
private Date subscribeTime;
private Date sendTime;

37
mall-mbg/src/main/java/com/macro/mall/model/SmsFlashPromotionProductRelation.java
View File

@ -1,53 +1,30 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.math.BigDecimal;
public class SmsFlashPromotionProductRelation implements Serializable {
/**
* 编号
*
* @mbggenerated
*/
@ApiModelProperty(value = "编号")
private Long id;
private Long flashPromotionId;
/**
* 编号
*
* @mbggenerated
*/
@ApiModelProperty(value = "编号")
private Long flashPromotionSessionId;
private Long productId;
/**
* 限时购价格
*
* @mbggenerated
*/
@ApiModelProperty(value = "限时购价格")
private BigDecimal flashPromotionPrice;
/**
* 限时购数量
*
* @mbggenerated
*/
@ApiModelProperty(value = "限时购数量")
private Integer flashPromotionCount;
/**
* 每人限购数量
*
* @mbggenerated
*/
@ApiModelProperty(value = "每人限购数量")
private Integer flashPromotionLimit;
/**
* 排序
*
* @mbggenerated
*/
@ApiModelProperty(value = "排序")
private Integer sort;
private static final long serialVersionUID = 1L;

37
mall-mbg/src/main/java/com/macro/mall/model/SmsFlashPromotionSession.java
View File

@ -1,49 +1,26 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
public class SmsFlashPromotionSession implements Serializable {
/**
* 编号
*
* @mbggenerated
*/
@ApiModelProperty(value = "编号")
private Long id;
/**
* 场次名称
*
* @mbggenerated
*/
@ApiModelProperty(value = "场次名称")
private String name;
/**
* 每日开始时间
*
* @mbggenerated
*/
@ApiModelProperty(value = "每日开始时间")
private Date startTime;
/**
* 每日结束时间
*
* @mbggenerated
*/
@ApiModelProperty(value = "每日结束时间")
private Date endTime;
/**
* 启用状态：0->不启用；1->启用
*
* @mbggenerated
*/
@ApiModelProperty(value = "启用状态：0->不启用；1->启用")
private Integer status;
/**
* 创建时间
*
* @mbggenerated
*/
@ApiModelProperty(value = "创建时间")
private Date createTime;
private static final long serialVersionUID = 1L;

43
mall-mbg/src/main/java/com/macro/mall/model/SmsHomeAdvertise.java
View File

@ -1,5 +1,6 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
@ -8,11 +9,7 @@ public class SmsHomeAdvertise implements Serializable {
private String name;
/**
* 轮播位置：0->PC首页轮播；1->app首页轮播
*
* @mbggenerated
*/
@ApiModelProperty(value = "轮播位置：0->PC首页轮播；1->app首页轮播")
private Integer type;
private String pic;
@ -21,46 +18,22 @@ public class SmsHomeAdvertise implements Serializable {
private Date endTime;
/**
* 上下线状态：0->下线；1->上线
*
* @mbggenerated
*/
@ApiModelProperty(value = "上下线状态：0->下线；1->上线")
private Integer status;
/**
* 点击数
*
* @mbggenerated
*/
@ApiModelProperty(value = "点击数")
private Integer clickCount;
/**
* 下单数
*
* @mbggenerated
*/
@ApiModelProperty(value = "下单数")
private Integer orderCount;
/**
* 链接地址
*
* @mbggenerated
*/
@ApiModelProperty(value = "链接地址")
private String url;
/**
* 备注
*
* @mbggenerated
*/
@ApiModelProperty(value = "备注")
private String note;
/**
* 排序
*
* @mbggenerated
*/
@ApiModelProperty(value = "排序")
private Integer sort;
private static final long serialVersionUID = 1L;

1
mall-mbg/src/main/java/com/macro/mall/model/SmsHomeBrand.java
View File

@ -1,5 +1,6 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
public class SmsHomeBrand implements Serializable {

1
mall-mbg/src/main/java/com/macro/mall/model/SmsHomeNewProduct.java
View File

@ -1,5 +1,6 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
public class SmsHomeNewProduct implements Serializable {

1
mall-mbg/src/main/java/com/macro/mall/model/SmsHomeRecommendProduct.java
View File

@ -1,5 +1,6 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
public class SmsHomeRecommendProduct implements Serializable {

1
mall-mbg/src/main/java/com/macro/mall/model/SmsHomeRecommendSubject.java
View File

@ -1,5 +1,6 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
public class SmsHomeRecommendSubject implements Serializable {

43
mall-mbg/src/main/java/com/macro/mall/model/UmsAdmin.java
View File

@ -1,5 +1,6 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
@ -10,53 +11,25 @@ public class UmsAdmin implements Serializable {
private String password;
/**
* 头像
*
* @mbggenerated
*/
@ApiModelProperty(value = "头像")
private String icon;
/**
* 邮箱
*
* @mbggenerated
*/
@ApiModelProperty(value = "邮箱")
private String email;
/**
* 昵称
*
* @mbggenerated
*/
@ApiModelProperty(value = "昵称")
private String nickName;
/**
* 备注信息
*
* @mbggenerated
*/
@ApiModelProperty(value = "备注信息")
private String note;
/**
* 创建时间
*
* @mbggenerated
*/
@ApiModelProperty(value = "创建时间")
private Date createTime;
/**
* 最后登录时间
*
* @mbggenerated
*/
@ApiModelProperty(value = "最后登录时间")
private Date loginTime;
/**
* 帐号启用状态：0->禁用；1->启用
*
* @mbggenerated
*/
@ApiModelProperty(value = "帐号启用状态：0->禁用；1->启用")
private Integer status;
private static final long serialVersionUID = 1L;

7
mall-mbg/src/main/java/com/macro/mall/model/UmsAdminLoginLog.java
View File

@ -1,5 +1,6 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
@ -14,11 +15,7 @@ public class UmsAdminLoginLog implements Serializable {
private String address;
/**
* 浏览器登录类型
*
* @mbggenerated
*/
@ApiModelProperty(value = "浏览器登录类型")
private String userAgent;
private static final long serialVersionUID = 1L;

1
mall-mbg/src/main/java/com/macro/mall/model/UmsAdminPermissionRelation.java
View File

@ -1,5 +1,6 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
public class UmsAdminPermissionRelation implements Serializable {

1
mall-mbg/src/main/java/com/macro/mall/model/UmsAdminRoleRelation.java
View File

@ -1,5 +1,6 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
public class UmsAdminRoleRelation implements Serializable {

31
mall-mbg/src/main/java/com/macro/mall/model/UmsGrowthChangeHistory.java
View File

@ -1,5 +1,6 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
@ -10,39 +11,19 @@ public class UmsGrowthChangeHistory implements Serializable {
private Date createTime;
/**
* 改变类型：0->增加；1->减少
*
* @mbggenerated
*/
@ApiModelProperty(value = "改变类型：0->增加；1->减少")
private Integer changeType;
/**
* 积分改变数量
*
* @mbggenerated
*/
@ApiModelProperty(value = "积分改变数量")
private Integer changeCount;
/**
* 操作人员
*
* @mbggenerated
*/
@ApiModelProperty(value = "操作人员")
private String operateMan;
/**
* 操作备注
*
* @mbggenerated
*/
@ApiModelProperty(value = "操作备注")
private String operateNote;
/**
* 积分来源：0->购物；1->管理员修改
*
* @mbggenerated
*/
@ApiModelProperty(value = "积分来源：0->购物；1->管理员修改")
private Integer sourceType;
private static final long serialVersionUID = 1L;

31
mall-mbg/src/main/java/com/macro/mall/model/UmsIntegrationChangeHistory.java
View File

@ -1,5 +1,6 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
@ -10,39 +11,19 @@ public class UmsIntegrationChangeHistory implements Serializable {
private Date createTime;
/**
* 改变类型：0->增加；1->减少
*
* @mbggenerated
*/
@ApiModelProperty(value = "改变类型：0->增加；1->减少")
private Integer changeType;
/**
* 积分改变数量
*
* @mbggenerated
*/
@ApiModelProperty(value = "积分改变数量")
private Integer changeCount;
/**
* 操作人员
*
* @mbggenerated
*/
@ApiModelProperty(value = "操作人员")
private String operateMan;
/**
* 操作备注
*
* @mbggenerated
*/
@ApiModelProperty(value = "操作备注")
private String operateNote;
/**
* 积分来源：0->购物；1->管理员修改
*
* @mbggenerated
*/
@ApiModelProperty(value = "积分来源：0->购物；1->管理员修改")
private Integer sourceType;
private static final long serialVersionUID = 1L;

25
mall-mbg/src/main/java/com/macro/mall/model/UmsIntegrationConsumeSetting.java
View File

@ -1,36 +1,21 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
public class UmsIntegrationConsumeSetting implements Serializable {
private Long id;
/**
* 每一元需要抵扣的积分数量
*
* @mbggenerated
*/
@ApiModelProperty(value = "每一元需要抵扣的积分数量")
private Integer deductionPerAmount;
/**
* 每笔订单最高抵用百分比
*
* @mbggenerated
*/
@ApiModelProperty(value = "每笔订单最高抵用百分比")
private Integer maxPercentPerOrder;
/**
* 每次使用积分最小单位100
*
* @mbggenerated
*/
@ApiModelProperty(value = "每次使用积分最小单位100")
private Integer useUnit;
/**
* 是否可以和优惠券同用；0->不可以；1->可以
*
* @mbggenerated
*/
@ApiModelProperty(value = "是否可以和优惠券同用；0->不可以；1->可以")
private Integer couponStatus;
private static final long serialVersionUID = 1L;

103
mall-mbg/src/main/java/com/macro/mall/model/UmsMember.java
View File

@ -1,5 +1,6 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
@ -8,123 +9,55 @@ public class UmsMember implements Serializable {
private Long memberLevelId;
/**
* 用户名
*
* @mbggenerated
*/
@ApiModelProperty(value = "用户名")
private String username;
/**
* 密码
*
* @mbggenerated
*/
@ApiModelProperty(value = "密码")
private String password;
/**
* 昵称
*
* @mbggenerated
*/
@ApiModelProperty(value = "昵称")
private String nickname;
/**
* 手机号码
*
* @mbggenerated
*/
@ApiModelProperty(value = "手机号码")
private String phone;
/**
* 帐号启用状态:0->禁用；1->启用
*
* @mbggenerated
*/
@ApiModelProperty(value = "帐号启用状态:0->禁用；1->启用")
private Integer status;
/**
* 注册时间
*
* @mbggenerated
*/
@ApiModelProperty(value = "注册时间")
private Date createTime;
/**
* 头像
*
* @mbggenerated
*/
@ApiModelProperty(value = "头像")
private String icon;
/**
* 性别：0->未知；1->男；2->女
*
* @mbggenerated
*/
@ApiModelProperty(value = "性别：0->未知；1->男；2->女")
private Integer gender;
/**
* 生日
*
* @mbggenerated
*/
@ApiModelProperty(value = "生日")
private Date birthday;
/**
* 所做城市
*
* @mbggenerated
*/
@ApiModelProperty(value = "所做城市")
private String city;
/**
* 职业
*
* @mbggenerated
*/
@ApiModelProperty(value = "职业")
private String job;
/**
* 个性签名
*
* @mbggenerated
*/
@ApiModelProperty(value = "个性签名")
private String personalizedSignature;
/**
* 用户来源
*
* @mbggenerated
*/
@ApiModelProperty(value = "用户来源")
private Integer sourceType;
/**
* 积分
*
* @mbggenerated
*/
@ApiModelProperty(value = "积分")
private Integer integration;
/**
* 成长值
*
* @mbggenerated
*/
@ApiModelProperty(value = "成长值")
private Integer growth;
/**
* 剩余抽奖次数
*
* @mbggenerated
*/
@ApiModelProperty(value = "剩余抽奖次数")
private Integer luckeyCount;
/**
* 历史积分数量
*
* @mbggenerated
*/
@ApiModelProperty(value = "历史积分数量")
private Integer historyIntegration;
private static final long serialVersionUID = 1L;

55
mall-mbg/src/main/java/com/macro/mall/model/UmsMemberLevel.java
View File

@ -1,5 +1,6 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.math.BigDecimal;
@ -10,67 +11,31 @@ public class UmsMemberLevel implements Serializable {
private Integer growthPoint;
/**
* 是否为默认等级：0->不是；1->是
*
* @mbggenerated
*/
@ApiModelProperty(value = "是否为默认等级：0->不是；1->是")
private Integer defaultStatus;
/**
* 免运费标准
*
* @mbggenerated
*/
@ApiModelProperty(value = "免运费标准")
private BigDecimal freeFreightPoint;
/**
* 每次评价获取的成长值
*
* @mbggenerated
*/
@ApiModelProperty(value = "每次评价获取的成长值")
private Integer commentGrowthPoint;
/**
* 是否有免邮特权
*
* @mbggenerated
*/
@ApiModelProperty(value = "是否有免邮特权")
private Integer priviledgeFreeFreight;
/**
* 是否有签到特权
*
* @mbggenerated
*/
@ApiModelProperty(value = "是否有签到特权")
private Integer priviledgeSignIn;
/**
* 是否有评论获奖励特权
*
* @mbggenerated
*/
@ApiModelProperty(value = "是否有评论获奖励特权")
private Integer priviledgeComment;
/**
* 是否有专享活动特权
*
* @mbggenerated
*/
@ApiModelProperty(value = "是否有专享活动特权")
private Integer priviledgePromotion;
/**
* 是否有会员价格特权
*
* @mbggenerated
*/
@ApiModelProperty(value = "是否有会员价格特权")
private Integer priviledgeMemberPrice;
/**
* 是否有生日特权
*
* @mbggenerated
*/
@ApiModelProperty(value = "是否有生日特权")
private Integer priviledgeBirthday;
private String note;

7
mall-mbg/src/main/java/com/macro/mall/model/UmsMemberLoginLog.java
View File

@ -1,5 +1,6 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
@ -14,11 +15,7 @@ public class UmsMemberLoginLog implements Serializable {
private String city;
/**
* 登录类型：0->PC；1->android;2->ios;3->小程序
*
* @mbggenerated
*/
@ApiModelProperty(value = "登录类型：0->PC；1->android;2->ios;3->小程序")
private Integer loginType;
private String province;

1
mall-mbg/src/main/java/com/macro/mall/model/UmsMemberMemberTagRelation.java
View File

@ -1,5 +1,6 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
public class UmsMemberMemberTagRelation implements Serializable {

1
mall-mbg/src/main/java/com/macro/mall/model/UmsMemberProductCategoryRelation.java
View File

@ -1,5 +1,6 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
public class UmsMemberProductCategoryRelation implements Serializable {

43
mall-mbg/src/main/java/com/macro/mall/model/UmsMemberReceiveAddress.java
View File

@ -1,5 +1,6 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
public class UmsMemberReceiveAddress implements Serializable {
@ -7,55 +8,27 @@ public class UmsMemberReceiveAddress implements Serializable {
private Long memberId;
/**
* 收货人名称
*
* @mbggenerated
*/
@ApiModelProperty(value = "收货人名称")
private String name;
private String phoneNumber;
/**
* 是否为默认
*
* @mbggenerated
*/
@ApiModelProperty(value = "是否为默认")
private Integer defaultStatus;
/**
* 邮政编码
*
* @mbggenerated
*/
@ApiModelProperty(value = "邮政编码")
private String postCode;
/**
* 省份/直辖市
*
* @mbggenerated
*/
@ApiModelProperty(value = "省份/直辖市")
private String province;
/**
* 城市
*
* @mbggenerated
*/
@ApiModelProperty(value = "城市")
private String city;
/**
* 区
*
* @mbggenerated
*/
@ApiModelProperty(value = "区")
private String region;
/**
* 详细地址(街道)
*
* @mbggenerated
*/
@ApiModelProperty(value = "详细地址(街道)")
private String detailAddress;
private static final long serialVersionUID = 1L;

37
mall-mbg/src/main/java/com/macro/mall/model/UmsMemberRuleSetting.java
View File

@ -1,51 +1,28 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.math.BigDecimal;
public class UmsMemberRuleSetting implements Serializable {
private Long id;
/**
* 连续签到天数
*
* @mbggenerated
*/
@ApiModelProperty(value = "连续签到天数")
private Integer continueSignDay;
/**
* 连续签到赠送数量
*
* @mbggenerated
*/
@ApiModelProperty(value = "连续签到赠送数量")
private Integer continueSignPoint;
/**
* 每消费多少元获取1个点
*
* @mbggenerated
*/
@ApiModelProperty(value = "每消费多少元获取1个点")
private BigDecimal consumePerPoint;
/**
* 最低获取点数的订单金额
*
* @mbggenerated
*/
@ApiModelProperty(value = "最低获取点数的订单金额")
private BigDecimal lowOrderAmount;
/**
* 每笔订单最高获取点数
*
* @mbggenerated
*/
@ApiModelProperty(value = "每笔订单最高获取点数")
private Integer maxPointPerOrder;
/**
* 类型：0->积分规则；1->成长值规则
*
* @mbggenerated
*/
@ApiModelProperty(value = "类型：0->积分规则；1->成长值规则")
private Integer type;
private static final long serialVersionUID = 1L;

55
mall-mbg/src/main/java/com/macro/mall/model/UmsMemberStatisticsInfo.java
View File

@ -1,5 +1,6 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
@ -9,60 +10,28 @@ public class UmsMemberStatisticsInfo implements Serializable {
private Long memberId;
/**
* 累计消费金额
*
* @mbggenerated
*/
@ApiModelProperty(value = "累计消费金额")
private BigDecimal consumeAmount;
/**
* 订单数量
*
* @mbggenerated
*/
@ApiModelProperty(value = "订单数量")
private Integer orderCount;
/**
* 优惠券数量
*
* @mbggenerated
*/
@ApiModelProperty(value = "优惠券数量")
private Integer couponCount;
/**
* 评价数
*
* @mbggenerated
*/
@ApiModelProperty(value = "评价数")
private Integer commentCount;
/**
* 退货数量
*
* @mbggenerated
*/
@ApiModelProperty(value = "退货数量")
private Integer returnOrderCount;
/**
* 登录次数
*
* @mbggenerated
*/
@ApiModelProperty(value = "登录次数")
private Integer loginCount;
/**
* 关注数量
*
* @mbggenerated
*/
@ApiModelProperty(value = "关注数量")
private Integer attendCount;
/**
* 粉丝数量
*
* @mbggenerated
*/
@ApiModelProperty(value = "粉丝数量")
private Integer fansCount;
private Integer collectProductCount;
@ -75,11 +44,7 @@ public class UmsMemberStatisticsInfo implements Serializable {
private Integer inviteFriendCount;
/**
* 最后一次下订单时间
*
* @mbggenerated
*/
@ApiModelProperty(value = "最后一次下订单时间")
private Date recentOrderTime;
private static final long serialVersionUID = 1L;

13
mall-mbg/src/main/java/com/macro/mall/model/UmsMemberTag.java
View File

@ -1,5 +1,6 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.math.BigDecimal;
@ -8,18 +9,10 @@ public class UmsMemberTag implements Serializable {
private String name;
/**
* 自动打标签完成订单数量
*
* @mbggenerated
*/
@ApiModelProperty(value = "自动打标签完成订单数量")
private Integer finishOrderCount;
/**
* 自动打标签完成订单金额
*
* @mbggenerated
*/
@ApiModelProperty(value = "自动打标签完成订单金额")
private BigDecimal finishOrderAmount;
private static final long serialVersionUID = 1L;

19
mall-mbg/src/main/java/com/macro/mall/model/UmsMemberTask.java
View File

@ -1,5 +1,6 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
public class UmsMemberTask implements Serializable {
@ -7,25 +8,13 @@ public class UmsMemberTask implements Serializable {
private String name;
/**
* 赠送成长值
*
* @mbggenerated
*/
@ApiModelProperty(value = "赠送成长值")
private Integer growth;
/**
* 赠送积分
*
* @mbggenerated
*/
@ApiModelProperty(value = "赠送积分")
private Integer intergration;
/**
* 任务类型：0->新手任务；1->日常任务
*
* @mbggenerated
*/
@ApiModelProperty(value = "任务类型：0->新手任务；1->日常任务")
private Integer type;
private static final long serialVersionUID = 1L;

55
mall-mbg/src/main/java/com/macro/mall/model/UmsPermission.java
View File

@ -1,72 +1,37 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
public class UmsPermission implements Serializable {
private Long id;
/**
* 父级权限id
*
* @mbggenerated
*/
@ApiModelProperty(value = "父级权限id")
private Long pid;
/**
* 名称
*
* @mbggenerated
*/
@ApiModelProperty(value = "名称")
private String name;
/**
* 权限值
*
* @mbggenerated
*/
@ApiModelProperty(value = "权限值")
private String value;
/**
* 图标
*
* @mbggenerated
*/
@ApiModelProperty(value = "图标")
private String icon;
/**
* 权限类型：0->目录；1->菜单；2->按钮（接口绑定权限）
*
* @mbggenerated
*/
@ApiModelProperty(value = "权限类型：0->目录；1->菜单；2->按钮（接口绑定权限）")
private Integer type;
/**
* 前端资源路径
*
* @mbggenerated
*/
@ApiModelProperty(value = "前端资源路径")
private String uri;
/**
* 启用状态；0->禁用；1->启用
*
* @mbggenerated
*/
@ApiModelProperty(value = "启用状态；0->禁用；1->启用")
private Integer status;
/**
* 创建时间
*
* @mbggenerated
*/
@ApiModelProperty(value = "创建时间")
private Date createTime;
/**
* 排序
*
* @mbggenerated
*/
@ApiModelProperty(value = "排序")
private Integer sort;
private static final long serialVersionUID = 1L;

31
mall-mbg/src/main/java/com/macro/mall/model/UmsRole.java
View File

@ -1,44 +1,25 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
public class UmsRole implements Serializable {
private Long id;
/**
* 名称
*
* @mbggenerated
*/
@ApiModelProperty(value = "名称")
private String name;
/**
* 描述
*
* @mbggenerated
*/
@ApiModelProperty(value = "描述")
private String description;
/**
* 后台用户数量
*
* @mbggenerated
*/
@ApiModelProperty(value = "后台用户数量")
private Integer adminCount;
/**
* 创建时间
*
* @mbggenerated
*/
@ApiModelProperty(value = "创建时间")
private Date createTime;
/**
* 启用状态：0->禁用；1->启用
*
* @mbggenerated
*/
@ApiModelProperty(value = "启用状态：0->禁用；1->启用")
private Integer status;
private Integer sort;

1
mall-mbg/src/main/java/com/macro/mall/model/UmsRolePermissionRelation.java
View File

@ -1,5 +1,6 @@
package com.macro.mall.model;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
public class UmsRolePermissionRelation implements Serializable {