diff --git a/mall-mbg/src/main/java/com/macro/mall/CommentGenerator.java b/mall-mbg/src/main/java/com/macro/mall/CommentGenerator.java new file mode 100644 index 0000000..6ddd564 --- /dev/null +++ b/mall-mbg/src/main/java/com/macro/mall/CommentGenerator.java @@ -0,0 +1,46 @@ +package com.macro.mall; + +import org.mybatis.generator.api.IntrospectedColumn; +import org.mybatis.generator.api.IntrospectedTable; +import org.mybatis.generator.api.dom.java.Field; +import org.mybatis.generator.internal.DefaultCommentGenerator; +import org.mybatis.generator.internal.util.StringUtility; + +import java.util.Properties; + +/** + * 自定义注释生成器 + */ +public class CommentGenerator extends DefaultCommentGenerator { + private boolean addRemarkComments = false; + + /** + * 设置用户配置的参数 + */ + @Override + public void addConfigurationProperties(Properties properties) { + super.addConfigurationProperties(properties); + this.addRemarkComments = StringUtility.isTrue(properties.getProperty("addRemarkComments")); + } + + /** + * 给字段添加注释 + */ + @Override + public void addFieldComment(Field field, IntrospectedTable introspectedTable, + IntrospectedColumn introspectedColumn) { + 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); + } + addJavadocTag(field, false); + field.addJavaDocLine(" */"); + } + } +} diff --git a/mall-mbg/src/main/java/com/macro/mall/model/CmsHelpCategory.java b/mall-mbg/src/main/java/com/macro/mall/model/CmsHelpCategory.java index d0fa70f..10cba13 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/CmsHelpCategory.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/CmsHelpCategory.java @@ -7,8 +7,18 @@ public class CmsHelpCategory implements Serializable { private String name; + /** + * 分类图标 + * + * @mbggenerated + */ private String icon; + /** + * 专题数量 + * + * @mbggenerated + */ private Integer helpCount; private Integer showStatus; diff --git a/mall-mbg/src/main/java/com/macro/mall/model/CmsMemberReport.java b/mall-mbg/src/main/java/com/macro/mall/model/CmsMemberReport.java index 24ed917..8e7b1d7 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/CmsMemberReport.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/CmsMemberReport.java @@ -6,16 +6,36 @@ import java.util.Date; public class CmsMemberReport implements Serializable { private Long id; + /** + * 举报类型：0->商品评价；1->话题内容；2->用户评论 + * + * @mbggenerated + */ private Integer reportType; + /** + * 举报人 + * + * @mbggenerated + */ private String reportMemberName; private Date createTime; private String reportObject; + /** + * 举报状态：0->未处理；1->已处理 + * + * @mbggenerated + */ private Integer reportStatus; + /** + * 处理结果：0->无效；1->有效；2->恶意 + * + * @mbggenerated + */ private Integer handleStatus; private String note; diff --git a/mall-mbg/src/main/java/com/macro/mall/model/CmsPrefrenceArea.java b/mall-mbg/src/main/java/com/macro/mall/model/CmsPrefrenceArea.java index 12ad636..06bdc76 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/CmsPrefrenceArea.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/CmsPrefrenceArea.java @@ -13,6 +13,11 @@ public class CmsPrefrenceArea implements Serializable { private Integer showStatus; + /** + * 展示图片 + * + * @mbggenerated + */ private byte[] pic; private static final long serialVersionUID = 1L; diff --git a/mall-mbg/src/main/java/com/macro/mall/model/CmsSubject.java b/mall-mbg/src/main/java/com/macro/mall/model/CmsSubject.java index 37a0c55..048ef7b 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/CmsSubject.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/CmsSubject.java @@ -10,8 +10,18 @@ public class CmsSubject implements Serializable { private String title; + /** + * 专题主图 + * + * @mbggenerated + */ private String pic; + /** + * 关联产品数量 + * + * @mbggenerated + */ private Integer productCount; private Integer recommendStatus; @@ -24,12 +34,27 @@ public class CmsSubject implements Serializable { private Integer commentCount; + /** + * 画册图片用逗号分割 + * + * @mbggenerated + */ private String albumPics; private String description; + /** + * 显示状态：0->不显示；1->显示 + * + * @mbggenerated + */ private Integer showStatus; + /** + * 转发数 + * + * @mbggenerated + */ private Integer forwardCount; private String content; diff --git a/mall-mbg/src/main/java/com/macro/mall/model/CmsSubjectCategory.java b/mall-mbg/src/main/java/com/macro/mall/model/CmsSubjectCategory.java index dbbd430..311ccc1 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/CmsSubjectCategory.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/CmsSubjectCategory.java @@ -7,8 +7,18 @@ public class CmsSubjectCategory implements Serializable { private String name; + /** + * 分类图标 + * + * @mbggenerated + */ private String icon; + /** + * 专题数量 + * + * @mbggenerated + */ private Integer subjectCount; private Integer showStatus; diff --git a/mall-mbg/src/main/java/com/macro/mall/model/CmsTopic.java b/mall-mbg/src/main/java/com/macro/mall/model/CmsTopic.java index 2acaf53..031101f 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/CmsTopic.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/CmsTopic.java @@ -16,16 +16,41 @@ public class CmsTopic implements Serializable { private Date endTime; + /** + * 参与人数 + * + * @mbggenerated + */ private Integer attendCount; + /** + * 关注人数 + * + * @mbggenerated + */ private Integer attentionCount; private Integer readCount; + /** + * 奖品名称 + * + * @mbggenerated + */ private String awardName; + /** + * 参与方式 + * + * @mbggenerated + */ private String attendType; + /** + * 话题内容 + * + * @mbggenerated + */ private String content; private static final long serialVersionUID = 1L; diff --git a/mall-mbg/src/main/java/com/macro/mall/model/CmsTopicCategory.java b/mall-mbg/src/main/java/com/macro/mall/model/CmsTopicCategory.java index f7047e0..d6cdd1e 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/CmsTopicCategory.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/CmsTopicCategory.java @@ -7,8 +7,18 @@ public class CmsTopicCategory implements Serializable { private String name; + /** + * 分类图标 + * + * @mbggenerated + */ private String icon; + /** + * 专题数量 + * + * @mbggenerated + */ private Integer subjectCount; private Integer showStatus; diff --git a/mall-mbg/src/main/java/com/macro/mall/model/OmsCompanyAddress.java b/mall-mbg/src/main/java/com/macro/mall/model/OmsCompanyAddress.java index 82d9fae..7176a3b 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/OmsCompanyAddress.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/OmsCompanyAddress.java @@ -5,14 +5,39 @@ import java.io.Serializable; public class OmsCompanyAddress implements Serializable { private Long id; + /** + * 地址名称 + * + * @mbggenerated + */ private String addressName; + /** + * 默认发货地址：0->否；1->是 + * + * @mbggenerated + */ private Integer sendStatus; + /** + * 是否默认收货地址：0->否；1->是 + * + * @mbggenerated + */ private Integer receiveStatus; + /** + * 收发货人姓名 + * + * @mbggenerated + */ private String name; + /** + * 收货人电话 + * + * @mbggenerated + */ private String phone; private String province; diff --git a/mall-mbg/src/main/java/com/macro/mall/model/OmsOrder.java b/mall-mbg/src/main/java/com/macro/mall/model/OmsOrder.java index 9d83d4f..7675758 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/OmsOrder.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/OmsOrder.java @@ -5,76 +5,246 @@ import java.math.BigDecimal; import java.util.Date; public class OmsOrder implements Serializable { + /** + * 订单id + * + * @mbggenerated + */ private Long id; private Long memberId; private Long couponId; + /** + * 订单编号 + * + * @mbggenerated + */ private String orderSn; + /** + * 提交时间 + * + * @mbggenerated + */ private Date createTime; + /** + * 用户帐号 + * + * @mbggenerated + */ private String memberUsername; + /** + * 订单总金额 + * + * @mbggenerated + */ private BigDecimal totalAmount; + /** + * 运费金额 + * + * @mbggenerated + */ private BigDecimal freightAmount; + /** + * 促销优化金额（促销价、满减、阶梯价） + * + * @mbggenerated + */ private BigDecimal promotionAmount; + /** + * 积分抵扣金额 + * + * @mbggenerated + */ private BigDecimal integrationAmount; + /** + * 优惠券抵扣金额 + * + * @mbggenerated + */ private BigDecimal couponAmount; + /** + * 管理员后台调整订单使用的折扣金额 + * + * @mbggenerated + */ private BigDecimal discountAmount; + /** + * 支付方式：0->未支付；1->支付宝；2->微信 + * + * @mbggenerated + */ private Integer payType; + /** + * 订单来源：0->PC订单；1->app订单 + * + * @mbggenerated + */ private Integer sourceType; + /** + * 订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单 + * + * @mbggenerated + */ private Integer status; + /** + * 订单类型：0->正常订单；1->秒杀订单 + * + * @mbggenerated + */ private Integer orderType; + /** + * 物流公司(配送方式) + * + * @mbggenerated + */ private String deliveryCompany; + /** + * 物流单号 + * + * @mbggenerated + */ private String deliverySn; + /** + * 自动确认时间（天） + * + * @mbggenerated + */ private Integer autoConfirmDay; + /** + * 可以获得的积分 + * + * @mbggenerated + */ private Integer integration; + /** + * 可以活动的成长值 + * + * @mbggenerated + */ private Integer growth; + /** + * 活动信息 + * + * @mbggenerated + */ private String promotionInfo; + /** + * 发票类型：0->不开发票；1->电子发票；2->纸质发票 + * + * @mbggenerated + */ private Integer billType; + /** + * 发票抬头 + * + * @mbggenerated + */ private String billHeader; + /** + * 发票内容 + * + * @mbggenerated + */ private String billContent; + /** + * 收票人电话 + * + * @mbggenerated + */ private String billReceiverPhone; + /** + * 收票人邮箱 + * + * @mbggenerated + */ private String billReceiverEmail; + /** + * 收货人姓名 + * + * @mbggenerated + */ private String receiverName; + /** + * 收货人电话 + * + * @mbggenerated + */ private String receiverPhone; + /** + * 收货人邮编 + * + * @mbggenerated + */ private String receiverPostCode; + /** + * 省份/直辖市 + * + * @mbggenerated + */ private String receiverProvince; + /** + * 城市 + * + * @mbggenerated + */ private String receiverCity; + /** + * 区 + * + * @mbggenerated + */ private String receiverRegion; + /** + * 详细地址 + * + * @mbggenerated + */ private String receiverDetailAddress; + /** + * 订单备注 + * + * @mbggenerated + */ private String note; + /** + * 确认收货状态：0->未确认；1->已确认 + * + * @mbggenerated + */ private Integer confirmStatus; private static final long serialVersionUID = 1L; diff --git a/mall-mbg/src/main/java/com/macro/mall/model/OmsOrderItem.java b/mall-mbg/src/main/java/com/macro/mall/model/OmsOrderItem.java index bdf4779..bffb699 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/OmsOrderItem.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/OmsOrderItem.java @@ -6,8 +6,18 @@ import java.math.BigDecimal; public class OmsOrderItem implements Serializable { private Long id; + /** + * 订单id + * + * @mbggenerated + */ private Long orderId; + /** + * 订单编号 + * + * @mbggenerated + */ private String orderSn; private Long productId; @@ -22,10 +32,25 @@ public class OmsOrderItem implements Serializable { private BigDecimal productAmount; + /** + * 购买数量 + * + * @mbggenerated + */ private Integer productCount; + /** + * 该商品经过优惠后的分解金额 + * + * @mbggenerated + */ private BigDecimal productRealAmount; + /** + * 商品的销售属性 + * + * @mbggenerated + */ private String sp1; private String sp2; diff --git a/mall-mbg/src/main/java/com/macro/mall/model/OmsOrderOperateHistory.java b/mall-mbg/src/main/java/com/macro/mall/model/OmsOrderOperateHistory.java index ed6c8ff..af1fe8b 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/OmsOrderOperateHistory.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/OmsOrderOperateHistory.java @@ -6,14 +6,39 @@ import java.util.Date; public class OmsOrderOperateHistory implements Serializable { private Long id; + /** + * 订单id + * + * @mbggenerated + */ private Long orderId; + /** + * 操作人：用户；系统；后台管理员 + * + * @mbggenerated + */ private String operateMan; + /** + * 操作时间 + * + * @mbggenerated + */ private Date createTime; + /** + * 订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单 + * + * @mbggenerated + */ private Integer orderStatus; + /** + * 备注 + * + * @mbggenerated + */ private String note; private static final long serialVersionUID = 1L; diff --git a/mall-mbg/src/main/java/com/macro/mall/model/OmsOrderReturnApply.java b/mall-mbg/src/main/java/com/macro/mall/model/OmsOrderReturnApply.java index 411dcc4..8cbdb5f 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/OmsOrderReturnApply.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/OmsOrderReturnApply.java @@ -7,24 +7,54 @@ import java.util.Date; public class OmsOrderReturnApply implements Serializable { private Long id; + /** + * 订单id + * + * @mbggenerated + */ private Long orderId; private Long companyAddressId; + /** + * 订单编号 + * + * @mbggenerated + */ private String orderSn; private Date createTime; private String memberUsername; + /** + * 退款金额 + * + * @mbggenerated + */ private BigDecimal returnAmount; private String returnName; + /** + * 退货人电话 + * + * @mbggenerated + */ private String returnPhone; + /** + * 申请状态：0->待处理；1->退货中；2->已完成；3->已拒绝 + * + * @mbggenerated + */ private Integer status; + /** + * 处理时间 + * + * @mbggenerated + */ private Date handleTime; private String productPic; @@ -33,26 +63,81 @@ public class OmsOrderReturnApply implements Serializable { private String brandName; + /** + * 商品销售属性：颜色：红色；尺码：xl; + * + * @mbggenerated + */ private String productAttr; + /** + * 退货数量 + * + * @mbggenerated + */ private Integer productCount; + /** + * 原因 + * + * @mbggenerated + */ private String reason; + /** + * 描述 + * + * @mbggenerated + */ private String description; + /** + * 凭证图片，以逗号隔开 + * + * @mbggenerated + */ private String proofPics; + /** + * 要退的邮费 + * + * @mbggenerated + */ private BigDecimal returnPostAmount; + /** + * 是否退邮费：0->不退；1->退 + * + * @mbggenerated + */ private Integer returnPostStatus; + /** + * 确认退款总金额 + * + * @mbggenerated + */ private BigDecimal confirmReturnAmount; + /** + * 处理备注 + * + * @mbggenerated + */ private String handleNote; + /** + * 处理人员 + * + * @mbggenerated + */ private String handleMan; + /** + * 收货人 + * + * @mbggenerated + */ private String receiveMan; private Date receiveTime; diff --git a/mall-mbg/src/main/java/com/macro/mall/model/OmsOrderReturnReason.java b/mall-mbg/src/main/java/com/macro/mall/model/OmsOrderReturnReason.java index 569c8bb..760e465 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/OmsOrderReturnReason.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/OmsOrderReturnReason.java @@ -5,10 +5,20 @@ import java.io.Serializable; public class OmsOrderReturnReason implements Serializable { private Long id; + /** + * 退货类型 + * + * @mbggenerated + */ private String name; private Integer sort; + /** + * 状态：0->不启用；1->启用 + * + * @mbggenerated + */ private Integer status; private static final long serialVersionUID = 1L; diff --git a/mall-mbg/src/main/java/com/macro/mall/model/OmsOrderSetting.java b/mall-mbg/src/main/java/com/macro/mall/model/OmsOrderSetting.java index 14af3d0..3cec3ff 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/OmsOrderSetting.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/OmsOrderSetting.java @@ -5,14 +5,39 @@ import java.io.Serializable; public class OmsOrderSetting implements Serializable { private Long id; + /** + * 秒杀订单超时关闭时间(分) + * + * @mbggenerated + */ private Integer flashOrderOvertime; + /** + * 正常订单超时时间(分) + * + * @mbggenerated + */ private Integer normalOrderOvertime; + /** + * 发货后自动确认收货时间（天） + * + * @mbggenerated + */ private Integer confirmOvertime; + /** + * 自动完成交易时间，不能申请售后（天） + * + * @mbggenerated + */ private Integer finishOvertime; + /** + * 订单完成后自动好评时间（天） + * + * @mbggenerated + */ private Integer commentOvertime; private static final long serialVersionUID = 1L; diff --git a/mall-mbg/src/main/java/com/macro/mall/model/PmsBrand.java b/mall-mbg/src/main/java/com/macro/mall/model/PmsBrand.java index 553bfe1..897ba5b 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/PmsBrand.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/PmsBrand.java @@ -7,22 +7,57 @@ public class PmsBrand implements Serializable { private String name; + /** + * 首字母 + * + * @mbggenerated + */ private String firstLetter; private Integer sort; + /** + * 是否为品牌制造商：0->不是；1->是 + * + * @mbggenerated + */ private Integer factoryStatus; private Integer showStatus; + /** + * 产品数量 + * + * @mbggenerated + */ private Integer productCount; + /** + * 产品评论数量 + * + * @mbggenerated + */ private Integer productCommentCount; + /** + * 品牌logo + * + * @mbggenerated + */ private String logo; + /** + * 专区大图 + * + * @mbggenerated + */ private String bigPic; + /** + * 品牌故事 + * + * @mbggenerated + */ private String brandStory; private static final long serialVersionUID = 1L; diff --git a/mall-mbg/src/main/java/com/macro/mall/model/PmsComment.java b/mall-mbg/src/main/java/com/macro/mall/model/PmsComment.java index cd2125c..68b0f1e 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/PmsComment.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/PmsComment.java @@ -12,22 +12,47 @@ public class PmsComment implements Serializable { private String productName; + /** + * 评价星数：0->5 + * + * @mbggenerated + */ private Integer star; + /** + * 评价的ip + * + * @mbggenerated + */ private String memberIp; private Date createTime; private Integer showStatus; + /** + * 购买时的商品属性 + * + * @mbggenerated + */ private String productAttribute; private Integer collectCouont; private Integer readCount; + /** + * 上传图片地址，以逗号隔开 + * + * @mbggenerated + */ private String pics; + /** + * 评论用户头像 + * + * @mbggenerated + */ private String memberIcon; private Integer replayCount; diff --git a/mall-mbg/src/main/java/com/macro/mall/model/PmsCommentReplay.java b/mall-mbg/src/main/java/com/macro/mall/model/PmsCommentReplay.java index 39e43b6..e57ff38 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/PmsCommentReplay.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/PmsCommentReplay.java @@ -16,6 +16,11 @@ public class PmsCommentReplay implements Serializable { private Date createTime; + /** + * 评论人员类型；0->会员；1->管理员 + * + * @mbggenerated + */ private Integer type; private static final long serialVersionUID = 1L; diff --git a/mall-mbg/src/main/java/com/macro/mall/model/PmsFeightTemplate.java b/mall-mbg/src/main/java/com/macro/mall/model/PmsFeightTemplate.java index d9386a8..8f2c360 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/PmsFeightTemplate.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/PmsFeightTemplate.java @@ -8,16 +8,36 @@ public class PmsFeightTemplate implements Serializable { private String name; + /** + * 计费类型:0->按重量；1->按件数 + * + * @mbggenerated + */ private Integer chargeType; + /** + * 首重kg + * + * @mbggenerated + */ private BigDecimal firstWeight; + /** + * 首费（元） + * + * @mbggenerated + */ private BigDecimal firstFee; private BigDecimal continueWeight; private BigDecimal continmeFee; + /** + * 目的地（省、市） + * + * @mbggenerated + */ private String dest; private static final long serialVersionUID = 1L; diff --git a/mall-mbg/src/main/java/com/macro/mall/model/PmsMemberPrice.java b/mall-mbg/src/main/java/com/macro/mall/model/PmsMemberPrice.java index c6df9e1..35ac360 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/PmsMemberPrice.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/PmsMemberPrice.java @@ -10,6 +10,11 @@ public class PmsMemberPrice implements Serializable { private Long memberLevelId; + /** + * 会员价格 + * + * @mbggenerated + */ private BigDecimal memberPrice; private static final long serialVersionUID = 1L; diff --git a/mall-mbg/src/main/java/com/macro/mall/model/PmsProduct.java b/mall-mbg/src/main/java/com/macro/mall/model/PmsProduct.java index 63f9dc7..daece90 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/PmsProduct.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/PmsProduct.java @@ -15,80 +15,235 @@ public class PmsProduct implements Serializable { private Long productAttributeCategoryId; + /** + * 限时购id + * + * @mbggenerated + */ private Integer flashPromotionId; private String name; private String pic; + /** + * 货号 + * + * @mbggenerated + */ private String productSn; + /** + * 删除状态：0->未删除；1->已删除 + * + * @mbggenerated + */ private Integer deleteStatus; + /** + * 上架状态：0->下架；1->上架 + * + * @mbggenerated + */ private Integer publishStatus; + /** + * 新品状态:0->不是新品；1->新品 + * + * @mbggenerated + */ private Integer newStatus; + /** + * 推荐状态；0->不推荐；1->推荐 + * + * @mbggenerated + */ private Integer recommandStatus; + /** + * 审核状态：0->未审核；1->审核通过 + * + * @mbggenerated + */ private Integer verifyStatus; + /** + * 排序 + * + * @mbggenerated + */ private Integer sort; + /** + * 销量 + * + * @mbggenerated + */ private Integer sale; private BigDecimal price; + /** + * 促销价格 + * + * @mbggenerated + */ private BigDecimal promotionPrice; + /** + * 赠送的积分 + * + * @mbggenerated + */ private Integer giftPoint; + /** + * 限制使用的积分数 + * + * @mbggenerated + */ private Integer usePointLimit; + /** + * 副标题 + * + * @mbggenerated + */ private String subTitle; + /** + * 市场价 + * + * @mbggenerated + */ private BigDecimal originalPrice; + /** + * 库存 + * + * @mbggenerated + */ private Integer stock; + /** + * 库存预警值 + * + * @mbggenerated + */ private Integer lowStock; + /** + * 单位 + * + * @mbggenerated + */ private String unit; + /** + * 商品重量，默认为克 + * + * @mbggenerated + */ private BigDecimal weight; + /** + * 是否为预告商品：0->不是；1->是 + * + * @mbggenerated + */ private Integer previewStatus; + /** + * 以逗号分割的产品服务：1->无忧退货；2->快速退款；3->免费包邮 + * + * @mbggenerated + */ private String serviceIds; private String keywords; private String note; + /** + * 画册图片，连产品图片限制为5张，以逗号分割 + * + * @mbggenerated + */ private String albumPics; private String detailTitle; + /** + * 限时购价格 + * + * @mbggenerated + */ private BigDecimal flashPromotionPrice; + /** + * 限时购数量 + * + * @mbggenerated + */ private Integer flashPromotionCount; + /** + * 限时购排序 + * + * @mbggenerated + */ private Integer flashPromotionSort; + /** + * 促销开始时间 + * + * @mbggenerated + */ private Date promotionStartTime; + /** + * 促销结束时间 + * + * @mbggenerated + */ private Date promotionEndTime; + /** + * 活动限购数量 + * + * @mbggenerated + */ private Integer promotionPerLimit; + /** + * 促销类型：0->使用促销价；1->使用会员价；2->使用阶梯价格；3->使用满减价格 + * + * @mbggenerated + */ private Integer promotionType; + /** + * 商品描述 + * + * @mbggenerated + */ private String description; private String detailDesc; + /** + * 产品详情网页内容 + * + * @mbggenerated + */ private String detailHtml; + /** + * 移动端网页详情 + * + * @mbggenerated + */ private String detailMobileHtml; private static final long serialVersionUID = 1L; diff --git a/mall-mbg/src/main/java/com/macro/mall/model/PmsProductAttribute.java b/mall-mbg/src/main/java/com/macro/mall/model/PmsProductAttribute.java index eec2cb7..912855b 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/PmsProductAttribute.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/PmsProductAttribute.java @@ -9,22 +9,67 @@ public class PmsProductAttribute implements Serializable { private String name; + /** + * 属性选择类型：0->唯一；1->单选；2->多选 + * + * @mbggenerated + */ private Integer selectType; + /** + * 属性录入方式：0->手工录入；1->从列表中选取 + * + * @mbggenerated + */ private Integer inputType; + /** + * 可选值列表，以逗号隔开 + * + * @mbggenerated + */ private String inputList; + /** + * 排序字段：最高的可以单独上传图片 + * + * @mbggenerated + */ private Integer sort; + /** + * 分类筛选样式：1->普通；1->颜色 + * + * @mbggenerated + */ private Integer filterType; + /** + * 检索类型；0->不需要进行检索；1->关键字检索；2->范围检索 + * + * @mbggenerated + */ private Integer searchType; + /** + * 相同属性产品是否关联；0->不关联；1->关联 + * + * @mbggenerated + */ private Integer relatedStatus; + /** + * 是否支持手动新增；0->不支持；1->支持 + * + * @mbggenerated + */ private Integer handAddStatus; + /** + * 属性的类型；0->规格；1->参数 + * + * @mbggenerated + */ private Integer type; private static final long serialVersionUID = 1L; diff --git a/mall-mbg/src/main/java/com/macro/mall/model/PmsProductAttributeCategory.java b/mall-mbg/src/main/java/com/macro/mall/model/PmsProductAttributeCategory.java index b56d3c0..0a77694 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/PmsProductAttributeCategory.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/PmsProductAttributeCategory.java @@ -7,8 +7,18 @@ public class PmsProductAttributeCategory implements Serializable { private String name; + /** + * 属性数量 + * + * @mbggenerated + */ private Integer attributeCount; + /** + * 参数数量 + * + * @mbggenerated + */ private Integer paramCount; private static final long serialVersionUID = 1L; diff --git a/mall-mbg/src/main/java/com/macro/mall/model/PmsProductAttributeValue.java b/mall-mbg/src/main/java/com/macro/mall/model/PmsProductAttributeValue.java index 710fd29..a0c6344 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/PmsProductAttributeValue.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/PmsProductAttributeValue.java @@ -9,6 +9,11 @@ public class PmsProductAttributeValue implements Serializable { private Long pmsProductAttributeId; + /** + * 存储的值 + * + * @mbggenerated + */ private String value; private static final long serialVersionUID = 1L; diff --git a/mall-mbg/src/main/java/com/macro/mall/model/PmsProductCategory.java b/mall-mbg/src/main/java/com/macro/mall/model/PmsProductCategory.java index 1b6f41d..3e0fe72 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/PmsProductCategory.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/PmsProductCategory.java @@ -5,26 +5,56 @@ import java.io.Serializable; public class PmsProductCategory implements Serializable { private Long id; + /** + * 上机分类的编号：0表示一级分类 + * + * @mbggenerated + */ private Long parentId; private String name; + /** + * 分类级别：0->1级；1->2级 + * + * @mbggenerated + */ private Integer level; private Integer productCount; private String productUnit; + /** + * 是否显示在导航栏：0->不显示；1->显示 + * + * @mbggenerated + */ private Integer navStatus; + /** + * 显示状态：0->不显示；1->显示 + * + * @mbggenerated + */ private Integer showStatus; private Integer sort; + /** + * 图标 + * + * @mbggenerated + */ private String icon; private String keywords; + /** + * 描述 + * + * @mbggenerated + */ private String description; private static final long serialVersionUID = 1L; diff --git a/mall-mbg/src/main/java/com/macro/mall/model/PmsProductLadder.java b/mall-mbg/src/main/java/com/macro/mall/model/PmsProductLadder.java index 2f16ac0..b473de7 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/PmsProductLadder.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/PmsProductLadder.java @@ -8,10 +8,25 @@ public class PmsProductLadder implements Serializable { private Long productId; + /** + * 满足的商品数量 + * + * @mbggenerated + */ private Integer count; + /** + * 折扣 + * + * @mbggenerated + */ private BigDecimal discount; + /** + * 折后价格 + * + * @mbggenerated + */ private BigDecimal price; private static final long serialVersionUID = 1L; diff --git a/mall-mbg/src/main/java/com/macro/mall/model/PmsProductOperateLog.java b/mall-mbg/src/main/java/com/macro/mall/model/PmsProductOperateLog.java index 9922cde..9c58163 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/PmsProductOperateLog.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/PmsProductOperateLog.java @@ -17,6 +17,11 @@ public class PmsProductOperateLog implements Serializable { private BigDecimal salePriceNew; + /** + * 赠送的积分 + * + * @mbggenerated + */ private Integer giftPointOld; private Integer giftPointNew; @@ -25,6 +30,11 @@ public class PmsProductOperateLog implements Serializable { private Integer usePointLimitNew; + /** + * 操作人 + * + * @mbggenerated + */ private String operateMan; private Date createTime; diff --git a/mall-mbg/src/main/java/com/macro/mall/model/PmsProductVertifyRecord.java b/mall-mbg/src/main/java/com/macro/mall/model/PmsProductVertifyRecord.java index aa75a8b..bcc48f7 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/PmsProductVertifyRecord.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/PmsProductVertifyRecord.java @@ -10,10 +10,20 @@ public class PmsProductVertifyRecord implements Serializable { private Date createTime; + /** + * 审核人 + * + * @mbggenerated + */ private String vertifyMan; private Integer status; + /** + * 反馈详情 + * + * @mbggenerated + */ private String detail; private static final long serialVersionUID = 1L; diff --git a/mall-mbg/src/main/java/com/macro/mall/model/PmsSkuStock.java b/mall-mbg/src/main/java/com/macro/mall/model/PmsSkuStock.java index 184356e..93ba72f 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/PmsSkuStock.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/PmsSkuStock.java @@ -8,22 +8,52 @@ public class PmsSkuStock implements Serializable { private Long productId; + /** + * sku编码 + * + * @mbggenerated + */ private String skuCode; private BigDecimal price; + /** + * 库存 + * + * @mbggenerated + */ private Integer stock; + /** + * 预警库存 + * + * @mbggenerated + */ private Integer lowStock; + /** + * 销售属性1 + * + * @mbggenerated + */ private String sp1; private String sp2; private String sp3; + /** + * 展示图片 + * + * @mbggenerated + */ private String pic; + /** + * 销量 + * + * @mbggenerated + */ private Integer sale; private static final long serialVersionUID = 1L; diff --git a/mall-mbg/src/main/java/com/macro/mall/model/SmsCoupon.java b/mall-mbg/src/main/java/com/macro/mall/model/SmsCoupon.java index 34fea48..8d1a604 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/SmsCoupon.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/SmsCoupon.java @@ -7,36 +7,101 @@ import java.util.Date; public class SmsCoupon implements Serializable { private Long id; + /** + * 优惠卷类型；0->全场赠券；1->会员赠券；2->购物赠券；3->注册赠券 + * + * @mbggenerated + */ private Integer type; private String name; + /** + * 使用平台：0->全部；1->移动；2->PC + * + * @mbggenerated + */ private String platform; + /** + * 数量 + * + * @mbggenerated + */ private Integer count; + /** + * 金额 + * + * @mbggenerated + */ private BigDecimal amount; + /** + * 每人限领张数 + * + * @mbggenerated + */ private Integer perLimit; + /** + * 使用门槛；0表示无门槛 + * + * @mbggenerated + */ private BigDecimal minPoint; private Date startTime; private Date endTime; + /** + * 使用类型：0->全场通用；1->指定分类；2->指定商品 + * + * @mbggenerated + */ private Integer useType; + /** + * 备注 + * + * @mbggenerated + */ private String note; + /** + * 发行数量 + * + * @mbggenerated + */ private Integer publishCount; + /** + * 已使用数量 + * + * @mbggenerated + */ private Integer useCount; + /** + * 可以领取的日期 + * + * @mbggenerated + */ private Date enableTime; + /** + * 优惠码 + * + * @mbggenerated + */ private String code; + /** + * 可领取的会员类型：0->无限时 + * + * @mbggenerated + */ private Integer memberLevel; private static final long serialVersionUID = 1L; diff --git a/mall-mbg/src/main/java/com/macro/mall/model/SmsCouponHistory.java b/mall-mbg/src/main/java/com/macro/mall/model/SmsCouponHistory.java index 8d588b6..8b28459 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/SmsCouponHistory.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/SmsCouponHistory.java @@ -12,16 +12,41 @@ public class SmsCouponHistory implements Serializable { private String couponCode; + /** + * 领取人昵称 + * + * @mbggenerated + */ private String memberNickname; + /** + * 获取类型：0->后台赠送；1->主动获取 + * + * @mbggenerated + */ private Integer getType; private Date createTime; + /** + * 使用状态：0->未使用；1->已使用；2->已过期 + * + * @mbggenerated + */ private Integer useStatus; + /** + * 使用时间 + * + * @mbggenerated + */ private Date useTime; + /** + * 订单编号 + * + * @mbggenerated + */ private String orderId; private static final long serialVersionUID = 1L; diff --git a/mall-mbg/src/main/java/com/macro/mall/model/SmsFlashPromotion.java b/mall-mbg/src/main/java/com/macro/mall/model/SmsFlashPromotion.java index d0bdef8..e3aeeed 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/SmsFlashPromotion.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/SmsFlashPromotion.java @@ -8,12 +8,32 @@ public class SmsFlashPromotion implements Serializable { private String title; + /** + * 开始时间 + * + * @mbggenerated + */ private Date startTime; + /** + * 结束时间 + * + * @mbggenerated + */ private Date endTime; + /** + * 上下线状态 + * + * @mbggenerated + */ private Integer status; + /** + * 秒杀时间段名称 + * + * @mbggenerated + */ private String timeName; private static final long serialVersionUID = 1L; diff --git a/mall-mbg/src/main/java/com/macro/mall/model/SmsFlashPromotionLog.java b/mall-mbg/src/main/java/com/macro/mall/model/SmsFlashPromotionLog.java index cb75355..cdc37a7 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/SmsFlashPromotionLog.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/SmsFlashPromotionLog.java @@ -14,6 +14,11 @@ public class SmsFlashPromotionLog implements Serializable { private String productName; + /** + * 会员订阅时间 + * + * @mbggenerated + */ private Date subscribeTime; private Date sendTime; diff --git a/mall-mbg/src/main/java/com/macro/mall/model/SmsHomeAdvertise.java b/mall-mbg/src/main/java/com/macro/mall/model/SmsHomeAdvertise.java index ab8dd14..d1784e3 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/SmsHomeAdvertise.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/SmsHomeAdvertise.java @@ -8,6 +8,11 @@ public class SmsHomeAdvertise implements Serializable { private String name; + /** + * 轮播位置：0->PC首页轮播；1->app首页轮播 + * + * @mbggenerated + */ private Integer type; private String pic; @@ -16,14 +21,39 @@ public class SmsHomeAdvertise implements Serializable { private Date endTime; + /** + * 上下线状态：0->下线；1->上线 + * + * @mbggenerated + */ private Integer status; + /** + * 点击数 + * + * @mbggenerated + */ private Integer clickCount; + /** + * 下单数 + * + * @mbggenerated + */ private Integer orderCount; + /** + * 链接地址 + * + * @mbggenerated + */ private String url; + /** + * 备注 + * + * @mbggenerated + */ private String note; private static final long serialVersionUID = 1L; diff --git a/mall-mbg/src/main/java/com/macro/mall/model/UmsAdmin.java b/mall-mbg/src/main/java/com/macro/mall/model/UmsAdmin.java index faf597b..d50eeeb 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/UmsAdmin.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/UmsAdmin.java @@ -9,6 +9,11 @@ public class UmsAdmin implements Serializable { private String password; + /** + * 头像 + * + * @mbggenerated + */ private String icon; private String email; diff --git a/mall-mbg/src/main/java/com/macro/mall/model/UmsAdminLoginLog.java b/mall-mbg/src/main/java/com/macro/mall/model/UmsAdminLoginLog.java index d729ddd..f94387c 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/UmsAdminLoginLog.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/UmsAdminLoginLog.java @@ -14,6 +14,11 @@ public class UmsAdminLoginLog implements Serializable { private String address; + /** + * 浏览器登录类型 + * + * @mbggenerated + */ private String userAgent; private static final long serialVersionUID = 1L; diff --git a/mall-mbg/src/main/java/com/macro/mall/model/UmsGrowthChangeHistory.java b/mall-mbg/src/main/java/com/macro/mall/model/UmsGrowthChangeHistory.java index f5c142c..4dbcb68 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/UmsGrowthChangeHistory.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/UmsGrowthChangeHistory.java @@ -10,14 +10,39 @@ public class UmsGrowthChangeHistory implements Serializable { private Date createTime; + /** + * 改变类型：0->增加；1->减少 + * + * @mbggenerated + */ private Integer changeType; + /** + * 积分改变数量 + * + * @mbggenerated + */ private Integer changeCount; + /** + * 操作人员 + * + * @mbggenerated + */ private String operateMan; + /** + * 操作备注 + * + * @mbggenerated + */ private String operateNote; + /** + * 积分来源：0->购物；1->管理员修改 + * + * @mbggenerated + */ private Integer sourceType; private static final long serialVersionUID = 1L; diff --git a/mall-mbg/src/main/java/com/macro/mall/model/UmsIntegrationChangeHistory.java b/mall-mbg/src/main/java/com/macro/mall/model/UmsIntegrationChangeHistory.java index f6c5803..d9e8b86 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/UmsIntegrationChangeHistory.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/UmsIntegrationChangeHistory.java @@ -10,14 +10,39 @@ public class UmsIntegrationChangeHistory implements Serializable { private Date createTime; + /** + * 改变类型：0->增加；1->减少 + * + * @mbggenerated + */ private Integer changeType; + /** + * 积分改变数量 + * + * @mbggenerated + */ private Integer changeCount; + /** + * 操作人员 + * + * @mbggenerated + */ private String operateMan; + /** + * 操作备注 + * + * @mbggenerated + */ private String operateNote; + /** + * 积分来源：0->购物；1->管理员修改 + * + * @mbggenerated + */ private Integer sourceType; private static final long serialVersionUID = 1L; diff --git a/mall-mbg/src/main/java/com/macro/mall/model/UmsIntergrationConsumeSetting.java b/mall-mbg/src/main/java/com/macro/mall/model/UmsIntergrationConsumeSetting.java index 3c9b9a5..682c1d2 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/UmsIntergrationConsumeSetting.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/UmsIntergrationConsumeSetting.java @@ -5,12 +5,32 @@ import java.io.Serializable; public class UmsIntergrationConsumeSetting implements Serializable { private Long id; + /** + * 每一元需要抵扣的积分数量 + * + * @mbggenerated + */ private Integer deductionPerAmount; + /** + * 每笔订单最高抵用百分比 + * + * @mbggenerated + */ private Integer maxPercentPerOrder; + /** + * 每次使用积分最小单位100 + * + * @mbggenerated + */ private Integer useUnit; + /** + * 是否可以和优惠券同用；0->不可以；1->可以 + * + * @mbggenerated + */ private Integer couponStatus; private static final long serialVersionUID = 1L; diff --git a/mall-mbg/src/main/java/com/macro/mall/model/UmsMember.java b/mall-mbg/src/main/java/com/macro/mall/model/UmsMember.java index f5513c0..3638fb8 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/UmsMember.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/UmsMember.java @@ -8,38 +8,123 @@ public class UmsMember implements Serializable { private Long memberLevelId; + /** + * 用户名 + * + * @mbggenerated + */ private String username; + /** + * 密码 + * + * @mbggenerated + */ private String password; + /** + * 昵称 + * + * @mbggenerated + */ private String nickname; + /** + * 手机号码 + * + * @mbggenerated + */ private String phone; + /** + * 帐号启用状态:0->禁用；1->启用 + * + * @mbggenerated + */ private Integer status; + /** + * 注册时间 + * + * @mbggenerated + */ private Date createTime; + /** + * 头像 + * + * @mbggenerated + */ private String icon; + /** + * 性别：0->未知；1->男；2->女 + * + * @mbggenerated + */ private Integer gender; + /** + * 生日 + * + * @mbggenerated + */ private Date birthday; + /** + * 所做城市 + * + * @mbggenerated + */ private String city; + /** + * 职业 + * + * @mbggenerated + */ private String job; + /** + * 个性签名 + * + * @mbggenerated + */ private String personalizedSignature; + /** + * 用户来源 + * + * @mbggenerated + */ private Integer sourceType; + /** + * 积分 + * + * @mbggenerated + */ private Integer integration; + /** + * 成长值 + * + * @mbggenerated + */ private Integer growth; + /** + * 剩余抽奖次数 + * + * @mbggenerated + */ private Integer luckeyCount; + /** + * 历史积分数量 + * + * @mbggenerated + */ private Integer historyIntegration; private static final long serialVersionUID = 1L; diff --git a/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberLevel.java b/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberLevel.java index 641779b..e99fb5e 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberLevel.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberLevel.java @@ -10,22 +10,67 @@ public class UmsMemberLevel implements Serializable { private Integer growthPoint; + /** + * 是否为默认等级：0->不是；1->是 + * + * @mbggenerated + */ private Integer defaultStatus; + /** + * 免运费标准 + * + * @mbggenerated + */ private BigDecimal freeFreightPoint; + /** + * 每次评价获取的成长值 + * + * @mbggenerated + */ private Integer commentGrowthPoint; + /** + * 是否有免邮特权 + * + * @mbggenerated + */ private Integer priviledgeFreeFreight; + /** + * 是否有签到特权 + * + * @mbggenerated + */ private Integer priviledgeSignIn; + /** + * 是否有评论获奖励特权 + * + * @mbggenerated + */ private Integer priviledgeComment; + /** + * 是否有专享活动特权 + * + * @mbggenerated + */ private Integer priviledgePromotion; + /** + * 是否有会员价格特权 + * + * @mbggenerated + */ private Integer priviledgeMemberPrice; + /** + * 是否有生日特权 + * + * @mbggenerated + */ private Integer priviledgeBirthday; private String note; diff --git a/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberLoginLog.java b/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberLoginLog.java index 410910a..315c661 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberLoginLog.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberLoginLog.java @@ -14,6 +14,11 @@ public class UmsMemberLoginLog implements Serializable { private String city; + /** + * 登录类型：0->PC；1->android;2->ios;3->小程序 + * + * @mbggenerated + */ private Integer loginType; private String province; diff --git a/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberReceiveAddress.java b/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberReceiveAddress.java index cb4b212..91c00e1 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberReceiveAddress.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberReceiveAddress.java @@ -7,14 +7,34 @@ public class UmsMemberReceiveAddress implements Serializable { private Long memberId; + /** + * 收货人名称 + * + * @mbggenerated + */ private String name; private String phoneNumber; + /** + * 收货地址 + * + * @mbggenerated + */ private String address; + /** + * 邮政编码 + * + * @mbggenerated + */ private String postCode; + /** + * 是否为默认 + * + * @mbggenerated + */ private Integer defaultStatus; private static final long serialVersionUID = 1L; diff --git a/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberRuleSetting.java b/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberRuleSetting.java index 622915d..607ee51 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberRuleSetting.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberRuleSetting.java @@ -6,16 +6,46 @@ import java.math.BigDecimal; public class UmsMemberRuleSetting implements Serializable { private Long id; + /** + * 连续签到天数 + * + * @mbggenerated + */ private Integer continueSignDay; + /** + * 连续签到赠送数量 + * + * @mbggenerated + */ private Integer continueSignPoint; + /** + * 每消费多少元获取1个点 + * + * @mbggenerated + */ private BigDecimal consumePerPoint; + /** + * 最低获取点数的订单金额 + * + * @mbggenerated + */ private BigDecimal lowOrderAmount; + /** + * 每笔订单最高获取点数 + * + * @mbggenerated + */ private Integer maxPointPerOrder; + /** + * 类型：0->积分规则；1->成长值规则 + * + * @mbggenerated + */ private Integer type; private static final long serialVersionUID = 1L; diff --git a/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberStatisticsInfo.java b/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberStatisticsInfo.java index 5e9ba1b..9f315d9 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberStatisticsInfo.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberStatisticsInfo.java @@ -9,20 +9,60 @@ public class UmsMemberStatisticsInfo implements Serializable { private Long memberId; + /** + * 累计消费金额 + * + * @mbggenerated + */ private BigDecimal consumeAmount; + /** + * 订单数量 + * + * @mbggenerated + */ private Integer orderCount; + /** + * 优惠券数量 + * + * @mbggenerated + */ private Integer couponCount; + /** + * 评价数 + * + * @mbggenerated + */ private Integer commentCount; + /** + * 退货数量 + * + * @mbggenerated + */ private Integer returnOrderCount; + /** + * 登录次数 + * + * @mbggenerated + */ private Integer loginCount; + /** + * 关注数量 + * + * @mbggenerated + */ private Integer attendCount; + /** + * 粉丝数量 + * + * @mbggenerated + */ private Integer fansCount; private Integer collectProductCount; @@ -35,6 +75,11 @@ public class UmsMemberStatisticsInfo implements Serializable { private Integer inviteFriendCount; + /** + * 最后一次下订单时间 + * + * @mbggenerated + */ private Date recentOrderTime; private static final long serialVersionUID = 1L; diff --git a/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberTag.java b/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberTag.java index 23b8f77..906f1e2 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberTag.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberTag.java @@ -8,8 +8,18 @@ public class UmsMemberTag implements Serializable { private String name; + /** + * 自动打标签完成订单数量 + * + * @mbggenerated + */ private Integer finishOrderCount; + /** + * 自动打标签完成订单金额 + * + * @mbggenerated + */ private BigDecimal finishOrderAmount; private static final long serialVersionUID = 1L; diff --git a/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberTask.java b/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberTask.java index 8919493..f080354 100644 --- a/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberTask.java +++ b/mall-mbg/src/main/java/com/macro/mall/model/UmsMemberTask.java @@ -7,10 +7,25 @@ public class UmsMemberTask implements Serializable { private String name; + /** + * 赠送成长值 + * + * @mbggenerated + */ private Integer growth; + /** + * 赠送积分 + * + * @mbggenerated + */ private Integer intergration; + /** + * 任务类型：0->新手任务；1->日常任务 + * + * @mbggenerated + */ private Integer type; private static final long serialVersionUID = 1L; diff --git a/mall-mbg/src/main/resources/generatorConfig.xml b/mall-mbg/src/main/resources/generatorConfig.xml index c6a3463..e1bb400 100644 --- a/mall-mbg/src/main/resources/generatorConfig.xml +++ b/mall-mbg/src/main/resources/generatorConfig.xml @@ -13,7 +13,7 @@ - +