cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

task--完善swagger文档注释

Browse Source
This commit is contained in:
taochengbo
2020-08-23 00:44:02 +08:00
parent 698d678eb5
commit 42a06b543d
80 changed files with 652 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
yshop-mall/src/main/java/co/yixiang/modules/activity/param/UserExtParam.java
View File

@ -1,5 +1,6 @@
package co.yixiang.modules.activity.param;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
@ -13,18 +14,20 @@ import java.io.Serializable;
@Data
public class UserExtParam implements Serializable {
//支付宝用户名
@ApiModelProperty(value = "提现支付宝用户名")
private String alipayCode;
@NotBlank(message = "体现类型不能为空")
@ApiModelProperty(value = "提现类型 weixin alipay")
private String extractType;
@NotBlank(message = "金额不能为空")
@ApiModelProperty(value = "提现金额")
private String money;
//微信号
@ApiModelProperty(value = "微信号")
private String weixin;
//支付宝账号
@ApiModelProperty(value = "支付宝账号")
private String name;
}

6
yshop-mall/src/main/java/co/yixiang/modules/activity/service/dto/SeckillTimeDto.java
View File

@ -1,5 +1,6 @@
package co.yixiang.modules.activity.service.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ -9,13 +10,18 @@ public class SeckillTimeDto {
/**
* 00:00
*/
@ApiModelProperty(value = "秒杀产品时间：00:00")
private String time;
/**
*状态
*/
@ApiModelProperty(value = "秒杀产品状态显示中文值")
private String state;
@ApiModelProperty(value = "秒杀产品状态")
private Integer status;
@ApiModelProperty(value = "秒杀产品停止时间")
private Integer stop;
}

4
yshop-mall/src/main/java/co/yixiang/modules/activity/vo/SeckillConfigVo.java
View File

@ -2,6 +2,7 @@ package co.yixiang.modules.activity.vo;
import co.yixiang.modules.activity.service.dto.SeckillTimeDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@ -9,10 +10,11 @@ import java.util.List;
@Data
public class SeckillConfigVo {
@ApiModelProperty(value = "秒杀产品时间信息")
private List<SeckillTimeDto> seckillTime;
private String lovely;
@ApiModelProperty(value = "秒杀产品时间索引")
private Integer seckillTimeIndex;
}

12
yshop-mall/src/main/java/co/yixiang/modules/activity/vo/StoreCouponUserVo.java
View File

@ -1,6 +1,7 @@
package co.yixiang.modules.activity.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
@ -9,7 +10,7 @@ import java.util.Date;
/**
* 优惠券发放记录对象StoreCouponUserVO
*
*
* @author hupeng
* @date 2020-05-06
*/
@ -20,23 +21,32 @@ public class StoreCouponUserVo implements Serializable
private static final long serialVersionUID = 1L;
/** 优惠券发放记录id */
@ApiModelProperty(value = "优惠券发放记录ID")
private Long id;
/** 优惠券名称 */
@ApiModelProperty(value = "优惠券名称")
private String couponTitle;
/** 优惠券的面值 */
@ApiModelProperty(value = "优惠券的面值")
private Double couponPrice;
/** 最低消费多少金额可用优惠券 */
@ApiModelProperty(value = "最低消费多少金额可用优惠券")
private Double useMinPrice;
/** 优惠券结束时间 */
@JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
@ApiModelProperty(value = "优惠券结束时间")
private Date endTime;
/** 优惠券类型 0通用券 1商品券 2内部券*/
@ApiModelProperty(value = "优惠券类型 0通用券 1商品券 2内部券")
private Integer type;
/**优惠产品ID*/
@ApiModelProperty(value = "优惠产品ID")
private String productId;

5
yshop-mall/src/main/java/co/yixiang/modules/activity/vo/StoreSeckillVo.java
View File

@ -2,6 +2,7 @@ package co.yixiang.modules.activity.vo;
import co.yixiang.modules.product.vo.YxStoreProductReplyQueryVo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Builder;
import lombok.Data;
@ -20,13 +21,17 @@ import java.io.Serializable;
public class StoreSeckillVo implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "秒杀产品评论信息")
private YxStoreProductReplyQueryVo reply;
@ApiModelProperty(value = "秒杀产品评论数量")
private Integer replyCount;
@ApiModelProperty(value = "秒杀产品信息")
private YxStoreSeckillQueryVo storeInfo;
@Builder.Default
@ApiModelProperty(value = "秒杀产品用户是否收藏")
private Boolean userCollect = false;

5
yshop-mall/src/main/java/co/yixiang/modules/activity/vo/YxStoreBargainQueryVo.java
View File

@ -102,7 +102,8 @@ public class YxStoreBargainQueryVo implements Serializable {
@ApiModelProperty(value = "砍价产品分享量")
private Integer share;
private Integer people; //参与人数
@ApiModelProperty(value = "砍价产品参与人数")
private Integer people;
}
}

7
yshop-mall/src/main/java/co/yixiang/modules/activity/vo/YxStoreCouponIssueQueryVo.java
View File

@ -26,8 +26,10 @@ public class YxStoreCouponIssueQueryVo implements Serializable {
@ApiModelProperty(value = "优惠券ID")
private Integer cid;
@ApiModelProperty(value = "优惠券名称")
private String cname;
@ApiModelProperty(value = "优惠券类别")
private Integer ctype;
@ApiModelProperty(value = "优惠券领取开启时间")
@ -50,10 +52,13 @@ public class YxStoreCouponIssueQueryVo implements Serializable {
@ApiModelProperty(value = "1 正常 0 未开启 -1 已无效")
private Integer status;
@ApiModelProperty(value = "优惠券价格")
private Double couponPrice;
@ApiModelProperty(value = "优惠券最低满多少能使用")
private Double useMinPrice;
@ApiModelProperty(value = "优惠券是否使用")
private Boolean isUse;
}
}

5
yshop-mall/src/main/java/co/yixiang/modules/activity/vo/YxStoreCouponUserQueryVo.java
View File

@ -41,6 +41,7 @@ public class YxStoreCouponUserQueryVo implements Serializable {
private BigDecimal useMinPrice;
@JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
@ApiModelProperty(value = "优惠券创建时间")
private Date createTime;
@ApiModelProperty(value = "优惠券结束时间")
@ -59,8 +60,10 @@ public class YxStoreCouponUserQueryVo implements Serializable {
@ApiModelProperty(value = "是否有效")
private Integer isFail;
@ApiModelProperty(value = "优惠券发放类型 0可用 1不可用")
private Integer _type;
@ApiModelProperty(value = "优惠券发放显示文字")
private String _msg;
}
}

6
yshop-mall/src/main/java/co/yixiang/modules/activity/vo/YxStorePinkQueryVo.java
View File

@ -26,7 +26,10 @@ public class YxStorePinkQueryVo implements Serializable {
@ApiModelProperty(value = "用户id")
private Long uid;
@ApiModelProperty(value = "用户昵称")
private String nickname;
@ApiModelProperty(value = "用户头像")
private String avatar;
@ApiModelProperty(value = "订单id 生成")
@ -56,6 +59,7 @@ public class YxStorePinkQueryVo implements Serializable {
@ApiModelProperty(value = "开始时间")
private Date createTime;
@ApiModelProperty(value = "结束时间")
private Date stopTime;
@ApiModelProperty(value = "团长id 0为团长")
@ -65,4 +69,4 @@ public class YxStorePinkQueryVo implements Serializable {
@ApiModelProperty(value = "状态1进行中2已完成3未完成")
private Integer status;
}
}

3
yshop-mall/src/main/java/co/yixiang/modules/activity/vo/YxStoreSeckillQueryVo.java
View File

@ -101,7 +101,8 @@ public class YxStoreSeckillQueryVo implements Serializable{
@ApiModelProperty(value = "显示")
private Integer isShow;
private Integer percent; //百分比
@ApiModelProperty(value = "百分比")
private Integer percent;

10
yshop-mall/src/main/java/co/yixiang/modules/cart/vo/YxStoreCartQueryVo.java
View File

@ -48,19 +48,25 @@ public class YxStoreCartQueryVo implements Serializable {
@ApiModelProperty(value = "砍价id")
private Long bargainId;
@ApiModelProperty(value = "商品信息")
private YxStoreProductQueryVo productInfo;
@ApiModelProperty(value = "成本价")
private Double costPrice;
@ApiModelProperty(value = "真实价格")
private Double truePrice;
@ApiModelProperty(value = "真实库存")
private Integer trueStock;
@ApiModelProperty(value = "vip真实价格")
private Double vipTruePrice;
@ApiModelProperty(value = "唯一id")
private String unique;
@ApiModelProperty(value = "是否回复")
private Integer isReply;
}
}

8
yshop-mall/src/main/java/co/yixiang/modules/order/param/ExpressParam.java
View File

@ -5,6 +5,7 @@
*/
package co.yixiang.modules.order.param;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
@ -16,8 +17,13 @@ import java.io.Serializable;
**/
@Data
public class ExpressParam implements Serializable {
////@NotBlank()
@ApiModelProperty(value = "订单编号")
private String orderCode;
@ApiModelProperty(value = "快递公司编码")
private String shipperCode;
@ApiModelProperty(value = "物流单号")
private String logisticCode;
}

30
yshop-mall/src/main/java/co/yixiang/modules/order/param/OrderParam.java
View File

@ -1,5 +1,6 @@
package co.yixiang.modules.order.param;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
@ -13,23 +14,52 @@ import java.io.Serializable;
**/
@Data
public class OrderParam implements Serializable {
@ApiModelProperty(value = "地址ID")
private String addressId;
@ApiModelProperty(value = "砍价产品ID")
private String bargainId;
@ApiModelProperty(value = "拼团ID")
private String combinationId;
@ApiModelProperty(value = "优惠券ID")
private String couponId;
@ApiModelProperty(value = "来源")
private String from;
@Size(max = 200,message = "长度超过了限制")
@ApiModelProperty(value = "备注")
private String mark;
@NotBlank(message="请选择支付方式")
@ApiModelProperty(value = "支付方式")
private String payType;
@ApiModelProperty(value = "门店电话")
private String phone;
@ApiModelProperty(value = "拼团产品ID")
private String pinkId;
@ApiModelProperty(value = "门店联系人")
private String realName;
@ApiModelProperty(value = "秒杀产品ID")
private String seckillId;
@ApiModelProperty(value = "配送方式 1=快递 ，2=门店自提")
private String shippingType;
@ApiModelProperty(value = "使用积分 1-表示使用")
private String useIntegral;
@ApiModelProperty(value = "支付渠道(0微信公众号1微信小程序) ")
private String isChannel;
@ApiModelProperty(value = "门店ID")
private String storeId;
}

9
yshop-mall/src/main/java/co/yixiang/modules/order/service/dto/ProductAttrDto.java
View File

@ -1,5 +1,6 @@
package co.yixiang.modules.order.service.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
@ -11,8 +12,16 @@ import java.io.Serializable;
**/
@Data
public class ProductAttrDto implements Serializable {
@ApiModelProperty(value = "产品属性ID")
private Long productId;
@ApiModelProperty(value = "产品属性sku")
private String sku;
@ApiModelProperty(value = "产品属性价格")
private Double price;
@ApiModelProperty(value = "产品属性图片")
private String image;
}

9
yshop-mall/src/main/java/co/yixiang/modules/order/service/dto/ProductDto.java
View File

@ -1,5 +1,6 @@
package co.yixiang.modules.order.service.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
@ -11,9 +12,17 @@ import java.io.Serializable;
**/
@Data
public class ProductDto implements Serializable {
@ApiModelProperty(value = "产品图片")
private String image;
@ApiModelProperty(value = "产品价格")
private Double price;
@ApiModelProperty(value = "产品名称")
private String storeName;
@ApiModelProperty(value = "产品属性信息")
private ProductAttrDto attrInfo;
}

16
yshop-mall/src/main/java/co/yixiang/modules/order/vo/OrderCartInfoVo.java
View File

@ -1,6 +1,7 @@
package co.yixiang.modules.order.vo;
import co.yixiang.modules.order.service.dto.ProductDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Builder;
import lombok.Data;
@ -19,25 +20,26 @@ import java.io.Serializable;
public class OrderCartInfoVo implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "订单ID")
private String orderId;
@ApiModelProperty(value = "商品ID")
private Long productId;
@ApiModelProperty(value = "购物车数量")
private Integer cartNum;
@ApiModelProperty(value = "拼团产品ID")
private Long combinationId;
@ApiModelProperty(value = "秒杀产品ID")
private Long seckillId;
@ApiModelProperty(value = "砍价产品ID")
private Long bargainId;
@ApiModelProperty(value = "产品信息")
private ProductDto productInfo;
}
}

38
yshop-mall/src/main/java/co/yixiang/modules/order/vo/UserOrderCountVo.java
View File

@ -1,5 +1,6 @@
package co.yixiang.modules.order.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
@ -19,15 +20,36 @@ import java.io.Serializable;
@AllArgsConstructor
@Builder
public class UserOrderCountVo implements Serializable {
//订单支付没有退款 数量
/**订单支付没有退款 数量*/
@ApiModelProperty(value = "订单支付没有退款数量")
private Integer orderCount;
//订单支付没有退款 支付总金额
/**订单支付没有退款 支付总金额*/
@ApiModelProperty(value = "订单支付没有退款支付总金额")
private Double sumPrice;
//订单待支付 数量
/**订单待支付 数量*/
@ApiModelProperty(value = "订单待支付数量")
private Integer unpaidCount;
private Integer unshippedCount; //订单待发货 数量
private Integer receivedCount; //订单待收货 数量
private Integer evaluatedCount; //订单待评价 数量
private Integer completeCount; //订单已完成 数量
private Integer refundCount; //订单退款
/**订单待发货数量*/
@ApiModelProperty(value = "订单待发货数量")
private Integer unshippedCount;
/**订单待收货数量*/
@ApiModelProperty(value = "订单待收货数量")
private Integer receivedCount;
/**订单待评价数量*/
@ApiModelProperty(value = "订单待评价数量")
private Integer evaluatedCount;
/**订单已完成数量*/
@ApiModelProperty(value = "订单已完成数量")
private Integer completeCount;
/**订单退款数量*/
@ApiModelProperty(value = "订单退款数量")
private Integer refundCount;
}

5
yshop-mall/src/main/java/co/yixiang/modules/order/vo/YxStoreOrderQueryVo.java
View File

@ -184,10 +184,13 @@ public class YxStoreOrderQueryVo implements Serializable {
private Integer isSystemDel;
@ApiModelProperty(value = "门店信息与二维码链接")
private String code;
@ApiModelProperty(value = "腾讯地图key")
private String mapKey;
@ApiModelProperty(value = "门店信息")
private YxSystemStoreQueryVo systemStore;
}
}

41
yshop-mall/src/main/java/co/yixiang/modules/product/domain/YxStoreProduct.java
View File

@ -12,6 +12,7 @@ import co.yixiang.modules.category.domain.YxStoreCategory;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
@ -41,45 +42,55 @@ public class YxStoreProduct extends BaseDomain {
/** 商品id */
@TableId
@ApiModelProperty(value = "商品ID")
private Long id;
/** 商户Id(0为总后台管理员创建,不为0的时候是商户后台创建) */
@ApiModelProperty(value = "商户Id(0为总后台管理员创建,不为0的时候是商户后台创建) 预留字段")
private Integer merId;
/** 商品图片 */
@NotBlank(message = "请上传商品图片")
@ApiModelProperty(value = "商品图片")
private String image;
/** 轮播图 */
@NotBlank(message = "请上传商品轮播")
@NotBlank(message = "请上传商品轮播图")
@ApiModelProperty(value = "商品轮播图")
private String sliderImage;
/** 商品名称 */
@NotBlank(message = "商品名称不能空")
@ApiModelProperty(value = "商品名称")
private String storeName;
/** 商品简介 */
@ApiModelProperty(value = "商品简介")
private String storeInfo;
/** 关键字 */
@ApiModelProperty(value = "关键字")
private String keyword;
/** 产品条码（一维码） */
@ApiModelProperty(value = "产品条码（一维码）")
private String barCode;
/** 分类id */
@ApiModelProperty(value = "分类id")
private String cateId;
/** 商品价格 */
@ApiModelProperty(value = "商品价格")
@NotNull(message = "请输入商品价格")
@DecimalMin(value="0.00", message = "商品价格不在合法范围内" )
@DecimalMax(value="99999999.99", message = "商品价格不在合法范围内")
@ -87,10 +98,12 @@ public class YxStoreProduct extends BaseDomain {
/** 会员价格 */
@ApiModelProperty(value = "会员价格")
private BigDecimal vipPrice;
/** 市场价 */
@ApiModelProperty(value = "市场价")
@NotNull(message = "请输入市场价")
@DecimalMin(value="0.00", message = "市场价不在合法范围内" )
@DecimalMax(value="99999999.99", message = "市场价不在合法范围内")
@ -98,69 +111,83 @@ public class YxStoreProduct extends BaseDomain {
/** 邮费 */
@ApiModelProperty(value = "邮费")
private BigDecimal postage;
/** 单位名 */
@NotBlank(message = "请填写单位")
@ApiModelProperty(value = "单位名")
private String unitName;
/** 排序 */
@ApiModelProperty(value = "排序")
private Integer sort;
/** 销量 */
@ApiModelProperty(value = "销量")
private Integer sales;
/** 库存 */
@ApiModelProperty(value = "库存")
@NotNull(message = "请输入库存")
@Min(message = "库存不能小于0",value = 1)
private Integer stock;
/** 状态（0：未上架，1：上架） */
@ApiModelProperty(value = "状态（0：未上架，1：上架）")
private Integer isShow;
/** 是否热卖 */
@ApiModelProperty(value = "是否热卖（0：否，1：是）")
private Integer isHot;
/** 是否优惠 */
@ApiModelProperty(value = "是否猜你喜欢（0：否，1：是）")
private Integer isBenefit;
/** 是否精品 */
@ApiModelProperty(value = "是否精品（0：否，1：是）")
private Integer isBest;
/** 是否新品 */
@ApiModelProperty(value = "是否新品（0：否，1：是）")
private Integer isNew;
/** 产品描述 */
@NotBlank(message = "请填写商品详情")
@ApiModelProperty(value = "商品详情")
private String description;
/** 是否包邮 */
@ApiModelProperty(value = "是否包邮")
private Integer isPostage;
/** 商户是否代理 0不可代理1可代理 */
@ApiModelProperty(value = "商户是否代理 0不可代理1可代理 ")
private Integer merUse;
/** 获得积分 */
@ApiModelProperty(value = "获得积分")
@DecimalMin(value="0.00", message = "获得积分不在合法范围内" )
@DecimalMax(value="99999999.99", message = "获得积分不在合法范围内")
private BigDecimal giveIntegral;
/** 成本价 */
@ApiModelProperty(value = "成本价")
@NotNull(message = "请输入成本价")
@DecimalMin(value="0.00", message = "成本价不在合法范围内" )
@DecimalMax(value="99999999.99", message = "成本价不在合法范围内")
@ -168,33 +195,41 @@ public class YxStoreProduct extends BaseDomain {
/** 秒杀状态 0 未开启 1已开启 */
@ApiModelProperty(value = "秒杀状态 0 未开启 1已开启")
private Integer isSeckill;
/** 砍价状态 0未开启 1开启 */
@ApiModelProperty(value = "砍价状态 0 未开启 1已开启")
private Integer isBargain;
/** 是否优品推荐 */
@ApiModelProperty(value = "是否优品推荐（0：否，1：是）")
private Integer isGood;
/** 虚拟销量 */
@ApiModelProperty(value = "虚拟销量")
private Integer ficti;
/** 浏览量 */
@ApiModelProperty(value = "浏览量")
private Integer browse;
/** 产品二维码地址(用户小程序海报) */
@ApiModelProperty(value = "品二维码地址(用户小程序海报) ")
private String codePath;
@ApiModelProperty(value = "邮费模版ID")
private Integer tempId;
@ApiModelProperty(value = "规格 0单 1多 ")
private Integer specType;
@ApiModelProperty(value = "是否单独分佣")
private Integer isSub;
@TableField(exist = false)

20
yshop-mall/src/main/java/co/yixiang/modules/product/domain/YxStoreProductAttrValue.java
View File

@ -10,6 +10,7 @@ import cn.hutool.core.bean.copier.CopyOptions;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
@ -37,62 +38,81 @@ public class YxStoreProductAttrValue implements Serializable {
/** 商品ID */
@ApiModelProperty(value = "商品ID")
private Long productId;
/** 商品属性索引值 (attr_value|attr_value[|....]) */
@ApiModelProperty(value = "商品属性索引值 (attr_value|attr_value[|....])")
private String sku;
/** 属性对应的库存 */
@ApiModelProperty(value = "属性对应的库存")
private Integer stock;
/** 拼团库存属性对应的库存 */
@ApiModelProperty(value = "拼团库存属性对应的库存")
private Integer pinkStock;
/** 秒杀库存属性对应的库存 */
@ApiModelProperty(value = "秒杀库存属性对应的库存")
private Integer seckillStock;
/** 销量 */
@ApiModelProperty(value = "销量")
private Integer sales;
/** 属性金额 */
@ApiModelProperty(value = "属性金额")
private BigDecimal price;
/** 拼团属性对应的金额 */
@ApiModelProperty(value = "拼团属性对应的金额")
private BigDecimal pinkPrice;
/** 秒杀属性对应的金额 */
@ApiModelProperty(value = "秒杀属性对应的金额")
private BigDecimal seckillPrice;
/** 图片 */
@ApiModelProperty(value = "属性对应的图片")
private String image;
/** 唯一值 */
@TableField(value = "`unique`")
@ApiModelProperty(value = "唯一值")
private String unique;
/** 成本价 */
@ApiModelProperty(value = "成本价")
private BigDecimal cost;
/** 商品条码 */
@ApiModelProperty(value = "商品条码")
private String barCode;
/** 原价 */
@ApiModelProperty(value = "原价")
private BigDecimal otPrice;
/** 重量 */
@ApiModelProperty(value = "重量")
private BigDecimal weight;
/** 体积 */
@ApiModelProperty(value = "体积")
private BigDecimal volume;
/** 一级返佣 */
@ApiModelProperty(value = "一级返佣")
private BigDecimal brokerage;
/** 二级返佣 */
@ApiModelProperty(value = "二级返佣")
private BigDecimal brokerageTwo;

12
yshop-mall/src/main/java/co/yixiang/modules/product/param/YxStoreProductQueryParam.java
View File

@ -2,6 +2,7 @@ package co.yixiang.modules.product.param;
import co.yixiang.common.web.param.QueryParam;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -19,10 +20,21 @@ import lombok.EqualsAndHashCode;
public class YxStoreProductQueryParam extends QueryParam {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "类别")
private String type;
@ApiModelProperty(value = "分类ID")
private String sid;
@ApiModelProperty(value = "是否新品")
private String news;
@ApiModelProperty(value = "价格排序")
private String priceOrder;
@ApiModelProperty(value = "销量排序")
private String salesOrder;
@ApiModelProperty(value = "关键字")
private String keyword;
}

11
yshop-mall/src/main/java/co/yixiang/modules/product/vo/ProductVo.java
View File

@ -1,6 +1,7 @@
package co.yixiang.modules.product.vo;
import co.yixiang.modules.product.domain.YxStoreProductAttrValue;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
@ -21,7 +22,7 @@ public class ProductVo{
private List<YxStoreProductQueryVo> goodList = new ArrayList();
@ApiModelProperty(value = "商户ID，预留字段")
private Integer merId = 0;
private String priceName = "";
@ -30,10 +31,13 @@ public class ProductVo{
private Map<String, YxStoreProductAttrValue> productValue = new LinkedHashMap<>();
@ApiModelProperty(value = "评论信息")
private YxStoreProductReplyQueryVo reply;
@ApiModelProperty(value = "回复渠道")
private String replyChance;
@ApiModelProperty(value = "回复数")
private Integer replyCount = 0;
//todo
@ -41,13 +45,16 @@ public class ProductVo{
private YxStoreProductQueryVo storeInfo;
@ApiModelProperty(value = "腾讯地图key")
private String mapKey;
//门店
@ApiModelProperty(value = "门店信息")
private YxSystemStoreQueryVo systemStore;
@ApiModelProperty(value = "用户ID")
private Integer uid = 0;
@ApiModelProperty(value = "模版名称")
private String tempName;
}

13
yshop-mall/src/main/java/co/yixiang/modules/product/vo/ReplyCountVo.java
View File

@ -1,5 +1,6 @@
package co.yixiang.modules.product.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
@ -19,11 +20,23 @@ import java.io.Serializable;
@NoArgsConstructor
@Builder
public class ReplyCountVo implements Serializable {
@ApiModelProperty(value = "总的评论数")
private Integer sumCount;
@ApiModelProperty(value = "好评数")
private Integer goodCount;
@ApiModelProperty(value = "中评数")
private Integer inCount;
@ApiModelProperty(value = "差评数")
private Integer poorCount;
@ApiModelProperty(value = "好评率")
private String replyChance;
@ApiModelProperty(value = "好评星星数")
private String replySstar;
}

11
yshop-mall/src/main/java/co/yixiang/modules/product/vo/YxStoreProductQueryVo.java
View File

@ -44,11 +44,13 @@ public class YxStoreProductQueryVo implements Serializable {
return image;
}
@ApiModelProperty(value = "是否收藏")
private Boolean userCollect = false;
@ApiModelProperty(value = "是否喜欢")
private Boolean userLike = false;
@ApiModelProperty(value = "轮播图")
@ApiModelProperty(value = "轮播图，多个用,分割")
private String sliderImage;
private List<String> sliderImageArr;
@ -123,17 +125,22 @@ public class YxStoreProductQueryVo implements Serializable {
@ApiModelProperty(value = "浏览量")
private Integer browse;
@ApiModelProperty(value = "状态（0：未上架，1：上架）")
private Integer isShow;
@ApiModelProperty(value = "获得积分")
private BigDecimal giveIntegral;
@ApiModelProperty(value = "运费模板ID")
private Integer tempId;
/** 是否单独分佣 */
@ApiModelProperty(value = "是否单独分佣")
private Integer isSub;
/** 规格 0单 1多 */
@ApiModelProperty(value = "规格 0单 1多 ")
private Integer specType;
}
}

9
yshop-mall/src/main/java/co/yixiang/modules/product/vo/YxStoreProductRelationQueryVo.java
View File

@ -37,18 +37,25 @@ public class YxStoreProductRelationQueryVo implements Serializable {
@ApiModelProperty(value = "添加时间")
private Date createTime;
@ApiModelProperty(value = "产品图片")
private String image;
@ApiModelProperty(value = "是否显示")
private Integer isShow;
@ApiModelProperty(value = "原价")
private Double otPrice;
@ApiModelProperty(value = "父ID")
private Integer pid;
@ApiModelProperty(value = "产品价格")
private Double price;
@ApiModelProperty(value = "产品销量")
private Integer sales;
@ApiModelProperty(value = "商品名称")
private String storeName;
}
}

9
yshop-mall/src/main/java/co/yixiang/modules/product/vo/YxStoreProductReplyQueryVo.java
View File

@ -67,19 +67,20 @@ public class YxStoreProductReplyQueryVo implements Serializable {
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date createTime;
@ApiModelProperty(value = "评价星星数")
private String star;
@ApiModelProperty(value = "用户昵称")
private String nickname;
@ApiModelProperty(value = "用户头像")
private String avatar;
@ApiModelProperty(value = "商品sku")
private String sku;
@JsonIgnore
private String cartInfo;
}
}

3
yshop-mall/src/main/java/co/yixiang/modules/product/vo/YxSystemStoreQueryVo.java
View File

@ -19,6 +19,7 @@ import java.io.Serializable;
public class YxSystemStoreQueryVo implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "门店ID")
private Integer id;
@ApiModelProperty(value = "门店名称")
@ -57,7 +58,7 @@ public class YxSystemStoreQueryVo implements Serializable {
@ApiModelProperty(value = "每日营业开关时间")
private String dayTime;
@ApiModelProperty(value = "距离")
private String distance;
}

9
yshop-mall/src/main/java/co/yixiang/modules/user/param/AddressDetailParam.java
View File

@ -1,6 +1,7 @@
package co.yixiang.modules.user.param;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
@ -12,9 +13,17 @@ import java.io.Serializable;
**/
@Data
public class AddressDetailParam implements Serializable {
@JsonProperty(value = "city_id")
@ApiModelProperty(value = "城市ID")
private Integer cityId;
@ApiModelProperty(value = "城市")
private String city;
@ApiModelProperty(value = "地区")
private String district;
@ApiModelProperty(value = "省份")
private String province;
}

15
yshop-mall/src/main/java/co/yixiang/modules/user/param/AddressParam.java
View File

@ -1,6 +1,7 @@
package co.yixiang.modules.user.param;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
@ -15,17 +16,31 @@ import java.io.Serializable;
@Data
@JsonIgnoreProperties(ignoreUnknown = true)
public class AddressParam implements Serializable {
@ApiModelProperty(value = "地址ID")
private String id;
@NotBlank
@Size(min = 1, max = 30,message = "长度超过了限制")
@ApiModelProperty(value = "收货地址真实名字")
private String real_name;
@ApiModelProperty(value = "收货地址邮编")
private String post_code;
@ApiModelProperty(value = "是否默认收货地址 true是 false否")
private String is_default;
private String wx_export;
@NotBlank
@Size(min = 1, max = 60,message = "长度超过了限制")
@ApiModelProperty(value = "收货详细地址")
private String detail;
@NotBlank
@ApiModelProperty(value = "收货手机号码")
private String phone;
@ApiModelProperty(value = "收货地址详情")
private AddressDetailParam address;
}

11
yshop-mall/src/main/java/co/yixiang/modules/user/vo/YxUserQueryVo.java
View File

@ -32,18 +32,25 @@ public class YxUserQueryVo implements Serializable {
@ApiModelProperty(value = "用户账号")
private String account;
@ApiModelProperty(value = "优惠券数量")
private Integer couponCount = 0;
@ApiModelProperty(value = "订单详情数据")
private UserOrderCountVo orderStatusNum;
private Integer statu;
@ApiModelProperty(value = "总的签到天数")
private Integer sumSignDay;
@ApiModelProperty(value = "当天是否签到")
private Boolean isDaySign;
@ApiModelProperty(value = "昨天是否签到")
private Boolean isYesterDaySign;
@ApiModelProperty(value = "核销权限")
private Boolean checkStatus;
@ -119,12 +126,16 @@ public class YxUserQueryVo implements Serializable {
@ApiModelProperty(value = "用户登陆类型，h5,wechat,routine")
private String loginType;
@ApiModelProperty(value = "是否会员")
private Boolean vip;
@ApiModelProperty(value = "会员ID")
private Integer vipId;
@ApiModelProperty(value = "会员图标")
private String vipIcon;
@ApiModelProperty(value = "会员名称")
private String vipName;
}

3
yshop-mall/src/main/java/co/yixiang/modules/wechat/vo/YxArticleQueryVo.java
View File

@ -59,6 +59,7 @@ public class YxArticleQueryVo implements Serializable {
@JsonProperty(value = "addTime")
private String createTime;
@ApiModelProperty(value = "文章内容")
private String content;
}
}