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-31 00:00:19 +08:00
parent 0f05897962
commit 3d6b4fc388
14 changed files with 225 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
yshop-mall/src/main/java/co/yixiang/modules/activity/domain/YxStoreBargain.java
View File

@ -10,6 +10,7 @@ import cn.hutool.core.bean.copier.CopyOptions;
import co.yixiang.domain.BaseDomain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -32,53 +33,64 @@ public class YxStoreBargain extends BaseDomain {
/** 砍价产品ID */
@TableId
@ApiModelProperty(value = "砍价产品ID")
private Long id;
/** 关联产品ID */
@ApiModelProperty(value = "关联产品ID")
private Long productId;
/** 砍价活动名称 */
@NotBlank(message = "请填写砍价名称")
@ApiModelProperty(value = "砍价产品名称")
private String title;
/** 砍价活动图片 */
@NotBlank(message = "请上传商品图片")
@ApiModelProperty(value = "砍价产品图片")
private String image;
/** 单位名称 */
@ApiModelProperty(value = "砍价产品单位名称")
private String unitName;
/** 库存 */
@NotNull(message = "请输入库存")
@Min(message = "库存不能小于0",value = 1)
@ApiModelProperty(value = "砍价产品库存")
private Integer stock;
/** 销量 */
@ApiModelProperty(value = "砍价产品销量")
private Integer sales;
/** 砍价产品轮播图 */
@NotBlank(message = "请上传商品轮播")
@NotBlank(message = "请上传商品轮播图")
@ApiModelProperty(value = "砍价产品轮播图")
private String images;
/** 砍价开启时间 */
@NotNull(message = "请选择开始时间")
@ApiModelProperty(value = "砍价产品开始时间")
private Date startTime;
/** 砍价结束时间 */
@NotNull(message = "请选择结束时间")
@ApiModelProperty(value = "砍价产品结束时间")
private Date stopTime;
/** 砍价产品名称 */
@ApiModelProperty(value = "砍价产品名称")
private String storeName;
@ -86,6 +98,7 @@ public class YxStoreBargain extends BaseDomain {
@NotNull(message = "请输入砍价金额")
@DecimalMin(value="0.00", message = "砍价金额不在合法范围内" )
@DecimalMax(value="99999999.99", message = "砍价金额不在合法范围内")
@ApiModelProperty(value = "砍价产品砍价金额")
private BigDecimal price;
@ -93,12 +106,14 @@ public class YxStoreBargain extends BaseDomain {
@NotNull(message = "请输入砍到最低价")
@DecimalMin(value="0.00", message = "砍到最低价不在合法范围内" )
@DecimalMax(value="99999999.99", message = "砍到最低价不在合法范围内")
@ApiModelProperty(value = "砍价商品最低价")
private BigDecimal minPrice;
/** 每次购买的砍价产品数量 */
@NotNull(message = "请输入限购")
@NotNull(message = "请输入限购数量")
@Min(message = "限购不能小于0",value = 1)
@ApiModelProperty(value = "每次购买的砍价产品数量")
private Integer num;
@ -106,6 +121,7 @@ public class YxStoreBargain extends BaseDomain {
@NotNull(message = "请输入单次砍最高价")
@DecimalMin(value="0.00", message = "单次砍最高价不在合法范围内" )
@DecimalMax(value="99999999.99", message = "单次砍最高价不在合法范围内")
@ApiModelProperty(value = "用户每次砍价的最大金额")
private BigDecimal bargainMaxPrice;
@ -113,63 +129,77 @@ public class YxStoreBargain extends BaseDomain {
@NotNull(message = "请输入单次砍最低价")
@DecimalMin(value="0.00", message = "单次砍最低价不在合法范围内" )
@DecimalMax(value="99999999.99", message = "单次砍最低价小金额不在合法范围内")
@ApiModelProperty(value = "用户每次砍价的最小金额")
private BigDecimal bargainMinPrice;
/** 用户每次砍价的次数 */
@NotNull(message = "请输入砍价的次数")
@Min(message = "砍价的次数不能小于0",value = 1)
@ApiModelProperty(value = "用户每次砍价的次数")
private Integer bargainNum;
/** 砍价状态 0(到砍价时间不自动开启) 1(到砍价时间自动开启时间) */
@ApiModelProperty(value = "砍价状态 0(到砍价时间不自动开启) 1(到砍价时间自动开启时间)")
private Integer status;
/** 砍价详情 */
@NotBlank(message = "请填写详情")
@ApiModelProperty(value = "砍价详情")
private String description;
/** 反多少积分 */
/** 返多少积分 */
@ApiModelProperty(value = "返多少积分")
private BigDecimal giveIntegral;
/** 砍价活动简介 */
@ApiModelProperty(value = "砍价产品简介")
private String info;
/** 成本价 */
@ApiModelProperty(value = "成本价")
private BigDecimal cost;
/** 排序 */
@ApiModelProperty(value = "排序")
private Integer sort;
/** 是否推荐0不推荐1推荐 */
@ApiModelProperty(value = "是否推荐0不推荐1推荐")
private Integer isHot;
/** 是否包邮 0不包邮 1包邮 */
@ApiModelProperty(value = "是否包邮 0不包邮 1包邮")
private Integer isPostage;
/** 邮费 */
@ApiModelProperty(value = "邮费")
private BigDecimal postage;
/** 砍价规则 */
@NotBlank(message = "请填写砍价规则")
@ApiModelProperty(value = "砍价规则描述")
private String rule;
/** 砍价产品浏览量 */
@ApiModelProperty(value = "砍价产品浏览量")
private Integer look;
/** 砍价产品分享量 */
@ApiModelProperty(value = "砍价产品分享量")
private Integer share;

32
yshop-mall/src/main/java/co/yixiang/modules/activity/domain/YxStoreCombination.java
View File

@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -36,29 +37,35 @@ import java.util.Map;
public class YxStoreCombination extends BaseDomain {
@TableId
@ApiModelProperty(value = "拼团产品ID")
private Long id;
/** 商品id */
@ApiModelProperty(value = "关联产品ID")
private Long productId;
/** 商户id */
@ApiModelProperty(value = "商户id 预留字段")
private Integer merId;
/** 推荐图 */
@NotBlank(message = "请上传商品图片")
@ApiModelProperty(value = "推荐图")
private String image;
/** 轮播图 */
@NotBlank(message = "请上传商品轮播")
@ApiModelProperty(value = "轮播图")
private String images;
/** 活动标题 */
@NotBlank(message = "请填写拼团名称")
@ApiModelProperty(value = "拼团产品名称")
private String title;
@ -66,10 +73,12 @@ public class YxStoreCombination extends BaseDomain {
/** 参团人数 */
@NotNull(message = "请输入拼团人数")
@Min(message = "拼团人数小于0",value = 1)
@ApiModelProperty(value = "拼团产品拼团人数")
private Integer people;
/** 简介 */
@ApiModelProperty(value = "拼团产品简介")
private String info;
@ -77,16 +86,19 @@ public class YxStoreCombination extends BaseDomain {
@NotNull(message = "请输入拼团价")
@DecimalMin(value="0.00", message = "拼团价不在合法范围内" )
@DecimalMax(value="99999999.99", message = "拼团价不在合法范围内")
@ApiModelProperty(value = "拼团产品拼团价")
private BigDecimal price;
private BigDecimal productPrice;
/** 排序 */
@ApiModelProperty(value = "排序")
private Integer sort;
/** 销量 */
@ApiModelProperty(value = "销量")
private Integer sales;
@ -97,10 +109,12 @@ public class YxStoreCombination extends BaseDomain {
/** 推荐 */
@ApiModelProperty(value = "是否推荐0不推荐1推荐")
private Integer isHost;
/** 产品状态 */
@ApiModelProperty(value = "拼团产品状态0不显示 1显示")
private Integer isShow;
@ -108,54 +122,66 @@ public class YxStoreCombination extends BaseDomain {
/** 商户是否可用1可用0不可用 */
@ApiModelProperty(value = "商户是否可用1可用0不可用 预留字段")
private Integer merUse;
/** 拼团内容 */
@NotBlank(message = "请填写详情")
@ApiModelProperty(value = "拼团产品详情")
private String description;
/** 拼团开始时间 */
@NotNull(message = "请选择结束时间")
@ApiModelProperty(value = "拼团产品结束时间")
private Date startTime;
/** 拼团结束时间 */
@NotNull(message = "请选择开始时间")
@ApiModelProperty(value = "拼团产品开始时间")
private Date stopTime;
/** 拼团订单有效时间 */
@NotNull(message = "请输入拼团时效")
@Min(message = "拼团时效不能小于0",value = 1)
@ApiModelProperty(value = "拼团订单有效时间")
private Integer effectiveTime;
/** 拼图产品成本 */
/** 拼团产品成本价 */
@ApiModelProperty(value = "拼团产品成本价")
private Integer cost;
/** 浏览量 */
@ApiModelProperty(value = "拼团产品浏览量")
private Integer browse;
/** 单位名 */
@ApiModelProperty(value = "拼团产品单位名")
private String unitName;
/**
* 规格 0单 1多
*/
@ApiModelProperty(value = "拼团产品规格 0单规格 1多规格")
private Integer specType;
/** 运费模板ID */
@JsonProperty("temp_id")
@ApiModelProperty(value = "运费模板ID")
private Long tempId;
//属性项目
/** 属性项目 */
@TableField(exist = false)
@ApiModelProperty(value = "属性项目")
private List<FromatDetailDto> items;
//sku结果集
/** sku结果集 */
@TableField(exist = false)
private List<Map<String,Object>> attrs;

13
yshop-mall/src/main/java/co/yixiang/modules/activity/domain/YxStoreCoupon.java
View File

@ -10,6 +10,7 @@ import cn.hutool.core.bean.copier.CopyOptions;
import co.yixiang.domain.BaseDomain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -30,44 +31,56 @@ public class YxStoreCoupon extends BaseDomain {
/** 优惠券表ID */
@TableId
@ApiModelProperty(value = "优惠券ID")
private Integer id;
/** 优惠券名称 */
@NotBlank(message = "请填写优惠券名称")
@ApiModelProperty(value = "优惠券名称")
private String title;
/** 兑换消耗积分值 */
@ApiModelProperty(value = "兑换消耗积分值")
private Integer integral;
/** 兑换的优惠券面值 */
@DecimalMin(value="0.00", message = "优惠券面值不在合法范围内" )
@DecimalMax(value="99999999.99", message = "优惠券面值不在合法范围内")
@ApiModelProperty(value = "兑换的优惠券面值")
private BigDecimal couponPrice;
/** 最低消费多少金额可用优惠券 */
@DecimalMin(value="0.00", message = "最低消费不在合法范围内" )
@DecimalMax(value="99999999.99", message = "最低消费不在合法范围内")
@ApiModelProperty(value = "最低消费多少金额可用优惠券")
private BigDecimal useMinPrice;
/** 优惠券有效期限（单位：天） */
@NotNull(message = "请输入有效期限")
@ApiModelProperty(value = "优惠券有效期限（单位：天）")
private Integer couponTime;
/** 排序 */
@ApiModelProperty(value = "排序")
private Integer sort;
/** 状态（0：关闭，1：开启） */
@ApiModelProperty(value = "优惠券状态（0：关闭，1：开启） ")
private Integer status;
/** 优惠券类型（0：通用券，1：商品券，2：内部券） */
@ApiModelProperty(value = "优惠券类型（0：通用券，1：商品券，2：内部券） ")
private Integer type;
/** 优惠券绑定产品ID */
@ApiModelProperty(value = "优惠券绑定产品ID ")
private String productId;

18
yshop-mall/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponIssue.java
View File

@ -10,6 +10,7 @@ import cn.hutool.core.bean.copier.CopyOptions;
import co.yixiang.domain.BaseDomain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -28,43 +29,52 @@ public class YxStoreCouponIssue extends BaseDomain {
private static final long serialVersionUID = 1L;
@TableId
@ApiModelProperty(value = "优惠券前台领取ID")
private Integer id;
@ApiModelProperty(value = "前台显示优惠券名称")
private String cname;
/** 优惠券ID */
@ApiModelProperty(value = "优惠券ID")
private Integer cid;
@ApiModelProperty(value = "优惠券类型 0-通用 1-商品券")
private Integer ctype;
/** 优惠券领取开启时间 */
@NotNull(message = "请选择结束时间")
@NotNull(message = "请选择开启时间")
@ApiModelProperty(value = "优惠券领取开启时间")
private Date startTime;
/** 优惠券领取结束时间 */
@NotNull(message = "请选择开始时间")
@NotNull(message = "请选择结束时间")
@ApiModelProperty(value = "优惠券领取结束时间")
private Date endTime;
/** 优惠券领取数量 */
@ApiModelProperty(value = "优惠券领取数量")
private Integer totalCount;
/** 优惠券剩余领取数量 */
@ApiModelProperty(value = "优惠券剩余领取数量")
private Integer remainCount;
/** 是否无限张数 */
@ApiModelProperty(value = "是否无限张数1：是 0：否")
private Integer isPermanent;
/** 1 正常 0 未开启 -1 已无效 */
@ApiModelProperty(value = "前台领取优惠券状态1 正常 0 未开启 -1 已无效")
private Integer status;
public void copy(YxStoreCouponIssue source){

4
yshop-mall/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponIssueUser.java
View File

@ -10,6 +10,7 @@ import cn.hutool.core.bean.copier.CopyOptions;
import co.yixiang.domain.BaseDomain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -23,14 +24,17 @@ import lombok.EqualsAndHashCode;
public class YxStoreCouponIssueUser extends BaseDomain {
@TableId
@ApiModelProperty(value = "优惠券前台用户领取记录ID")
private Long id;
/** 领取优惠券用户ID */
@ApiModelProperty(value = "领取优惠券用户ID")
private Long uid;
/** 优惠券前台领取ID */
@ApiModelProperty(value = "优惠券前台领取ID")
private Integer issueCouponId;

12
yshop-mall/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponUser.java
View File

@ -10,6 +10,7 @@ import cn.hutool.core.bean.copier.CopyOptions;
import co.yixiang.domain.BaseDomain;
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.Data;
@ -33,46 +34,57 @@ public class YxStoreCouponUser extends BaseDomain {
/** 优惠券发放记录id */
@TableId
@ApiModelProperty(value = "优惠券发放记录id")
private Long id;
/** 兑换的项目id */
@ApiModelProperty(value = "兑换的项目id")
private Integer cid;
/** 优惠券所属用户 */
@ApiModelProperty(value = "优惠券所属用户")
private Long uid;
/** 优惠券名称 */
@ApiModelProperty(value = "优惠券名称")
private String couponTitle;
/** 优惠券的面值 */
@ApiModelProperty(value = "优惠券的面值")
private BigDecimal couponPrice;
/** 最低消费多少金额可用优惠券 */
@ApiModelProperty(value = "最低消费多少金额可用优惠券")
private BigDecimal useMinPrice;
/** 优惠券结束时间 */
@ApiModelProperty(value = "优惠券结束时间")
private Date endTime;
/** 使用时间 */
@ApiModelProperty(value = "使用时间")
private Date useTime;
/** 获取方式 */
@ApiModelProperty(value = "获取方式：get领取 send派送")
private String type;
/** 状态（0：未使用，1：已使用, 2:已过期） */
@ApiModelProperty(value = "状态（0：未使用，1：已使用, 2:已过期）")
private Integer status;
/** 是否有效 */
@ApiModelProperty(value = "是否有效1是 0否")
private Integer isFail;

18
yshop-mall/src/main/java/co/yixiang/modules/activity/domain/YxStorePink.java
View File

@ -10,6 +10,7 @@ import cn.hutool.core.bean.copier.CopyOptions;
import co.yixiang.domain.BaseDomain;
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.Data;
@ -32,61 +33,76 @@ import java.util.Date;
public class YxStorePink extends BaseDomain {
@TableId
@ApiModelProperty(value = "拼团产品ID")
private Long id;
/** 用户id */
@ApiModelProperty(value = "拼团产品用户ID")
private Long uid;
/** 订单id 生成 */
@ApiModelProperty(value = "拼团产品订单ID 生成")
private String orderId;
/** 订单id 数据库 */
@ApiModelProperty(value = "拼团产品订单id 数据库")
private Long orderIdKey;
/** 购买商品个数 */
@ApiModelProperty(value = "购买商品个数")
private Integer totalNum;
/** 购买总金额 */
@ApiModelProperty(value = "购买总金额")
private BigDecimal totalPrice;
/** 拼团产品id */
@ApiModelProperty(value = "拼团产品id")
private Long cid;
/** 产品id */
@ApiModelProperty(value = "产品id")
private Long pid;
/** 拼图总人数 */
@ApiModelProperty(value = "拼图总人数")
private Integer people;
/** 拼团产品单价 */
@ApiModelProperty(value = "拼团产品单价")
private BigDecimal price;
/** 拼团产品停止时间 */
@ApiModelProperty(value = "拼团产品停止时间")
private Date stopTime;
/** 团长id 0为团长 */
@ApiModelProperty(value = "拼团产品团长id 0为团长")
private Long kId;
/** 是否发送模板消息0未发送1已发送 */
@ApiModelProperty(value = "是否发送模板消息0未发送1已发送")
private Integer isTpl;
/** 是否退款 0未退款 1已退款 */
@ApiModelProperty(value = "是否退款 0未退款 1已退款")
private Integer isRefund;
/** 状态1进行中2已完成3未完成 */
@ApiModelProperty(value = "状态1进行中2已完成3未完成")
private Integer status;

42
yshop-mall/src/main/java/co/yixiang/modules/activity/domain/YxStoreSeckill.java
View File

@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -27,6 +28,7 @@ import java.util.List;
import java.util.Map;
/**
* 商品秒杀产品表
* @author hupeng
* @date 2020-05-13
*/
@ -37,29 +39,35 @@ public class YxStoreSeckill extends BaseDomain {
/** 商品秒杀产品表id */
@TableId
@ApiModelProperty(value = "商品秒杀产品表id")
private Long id;
/** 商品id */
@ApiModelProperty(value = "商品id")
private Long productId;
/** 推荐图 */
@NotBlank(message = "请上传商品图片")
@ApiModelProperty(value = "推荐图")
private String image;
/** 轮播图 */
@NotBlank(message = "请上传商品轮播")
@ApiModelProperty(value = "轮播图")
private String images;
/** 活动标题 */
@NotBlank(message = "请填写秒杀名称")
@ApiModelProperty(value = "秒杀名称")
private String title;
/** 简介 */
@ApiModelProperty(value = "简介")
private String info;
@ -67,68 +75,83 @@ public class YxStoreSeckill extends BaseDomain {
@NotNull(message = "请输入秒杀价")
@DecimalMin(value="0.00", message = "秒杀价不在合法范围内" )
@DecimalMax(value="99999999.99", message = "秒杀价不在合法范围内")
@ApiModelProperty(value = "秒杀价")
private BigDecimal price;
/** 成本 */
@ApiModelProperty(value = "成本价")
private BigDecimal cost;
/** 原价 */
@ApiModelProperty(value = "原价")
private BigDecimal otPrice;
/** 返多少积分 */
@ApiModelProperty(value = "返多少积分")
private BigDecimal giveIntegral;
/** 排序 */
@ApiModelProperty(value = "排序")
private Integer sort;
/** 库存 */
@NotNull(message = "请输入库存")
@Min(message = "库存不能小于0",value = 1)
@ApiModelProperty(value = "秒杀库存")
private Integer stock;
/** 销量 */
@ApiModelProperty(value = "秒杀销量")
private Integer sales;
/** 单位名 */
@ApiModelProperty(value = "单位名")
private String unitName;
/** 邮费 */
@ApiModelProperty(value = "邮费")
private BigDecimal postage;
/** 内容 */
@NotBlank(message = "请填写详情")
@ApiModelProperty(value = "详细内容")
private String description;
/** 开始时间 */
@NotNull(message = "请选择秒杀结束时间")
@NotNull(message = "请选择秒杀开始时间")
@ApiModelProperty(value = "秒杀开始时间")
private Date startTime;
/** 结束时间 */
@NotNull(message = "请选择秒杀开始时间")
@NotNull(message = "请选择秒杀结束时间")
@ApiModelProperty(value = "秒杀结束时间")
private Date stopTime;
/** 产品状态 */
@ApiModelProperty(value = "产品状态")
private Integer status;
/** 是否包邮 */
@ApiModelProperty(value = "是否包邮")
private Integer isPostage;
/** 热门推荐 */
@ApiModelProperty(value = "是否热门推荐")
private Integer isHot;
@ -136,30 +159,39 @@ public class YxStoreSeckill extends BaseDomain {
/** 最多秒杀几个 */
@NotNull(message = "请输入限购")
@Min(message = "限购不能小于0",value = 1)
@ApiModelProperty(value = "最多秒杀几个商品")
private Integer num;
/** 显示 */
@ApiModelProperty(value = "是否显示 0否 1显示")
private Integer isShow;
/** 时间段id */
@NotNull(message = "请选择开始时间")
@ApiModelProperty(value = "时间段id")
private Integer timeId;
/**
* 规格 0单 1多
* 规格 0单规格 1多规格
*/
@ApiModelProperty(value = "规格 0单规格 1多规格")
private Integer specType;
/** 运费模板ID */
@JsonProperty("temp_id")
@ApiModelProperty(value = "运费模板ID")
private Long tempId;
//属性项目
/** 属性项目 */
@TableField(exist = false)
@ApiModelProperty(value = "属性项目")
private List<FromatDetailDto> items;
//sku结果集
/** sku结果集 */
@TableField(exist = false)
@ApiModelProperty(value = "sku结果集")
private List<Map<String,Object>> attrs;
public void copy(YxStoreSeckill source){

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

@ -1,5 +1,6 @@
package co.yixiang.modules.activity.service.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
@ -12,18 +13,38 @@ import java.util.Date;
**/
@Data
public class PinkDto implements Serializable {
@ApiModelProperty(value = "拼团ID")
private Long id;
@ApiModelProperty(value = "用户ID")
private Long uid;
@ApiModelProperty(value = "拼图总人数")
private Integer people;
@ApiModelProperty(value = "拼团产品单价")
private Double price;
@ApiModelProperty(value = "拼图结束时间")
private Date stopTime;
@ApiModelProperty(value = "拼团用户昵称")
private String nickname;
@ApiModelProperty(value = "拼团用户头像")
private String avatar;
@ApiModelProperty(value = "参与的拼团的id集合")
private String count;
@ApiModelProperty(value = "拼图时效：小时")
private String h;
@ApiModelProperty(value = "拼图时效：分钟")
private String i;
@ApiModelProperty(value = "拼图时效：秒")
private String s;

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

@ -1,6 +1,7 @@
package co.yixiang.modules.activity.service.dto;
import co.yixiang.modules.activity.domain.YxStorePink;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
@ -20,9 +21,24 @@ import java.util.List;
@NoArgsConstructor
@Builder
public class PinkUserDto {
private List<YxStorePink> pinkAll;//拼团的团员
private YxStorePink pinkT; //单个拼团信息
private List<Long> idAll; //拼团id集合
private List<Long> uidAll; //拼团用户id集合
private Integer count; //还差几人成团
/**拼团的团员*/
@ApiModelProperty(value = "拼团的团员信息")
private List<YxStorePink> pinkAll;
/**单个拼团信息*/
@ApiModelProperty(value = "单个拼团信息")
private YxStorePink pinkT;
/**拼团id集合*/
@ApiModelProperty(value = "拼团id集合")
private List<Long> idAll;
/**拼团用户id集合*/
@ApiModelProperty(value = "拼团用户id集合")
private List<Long> uidAll;
/**还差几人成团*/
@ApiModelProperty(value = "还差几人成团")
private Integer count;
}

14
yshop-mall/src/main/java/co/yixiang/modules/activity/vo/StoreCombinationVo.java
View File

@ -4,6 +4,7 @@ import co.yixiang.modules.activity.service.dto.PinkDto;
import co.yixiang.modules.product.domain.YxStoreProductAttrValue;
import co.yixiang.modules.product.vo.YxStoreProductAttrQueryVo;
import co.yixiang.modules.product.vo.YxStoreProductReplyQueryVo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
@ -24,27 +25,40 @@ import java.util.Map;
public class StoreCombinationVo implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "拼团详情")
private List<PinkDto> pink;
@ApiModelProperty(value = "参与的拼团的id 集合")
private List<Long> pindAll;
@ApiModelProperty(value = "拼团成功的用户信息")
private List<String> pinkOkList;
@ApiModelProperty(value = "拼团完成的商品总件数")
private Integer pinkOkSum;
@ApiModelProperty(value = "拼团评论信息")
private YxStoreProductReplyQueryVo reply;
@ApiModelProperty(value = "拼团评论总条数")
private Integer replyCount = 0;
@ApiModelProperty(value = "拼团好评比例")
private String replyChance;
@ApiModelProperty(value = "拼团产品表信息")
private YxStoreCombinationQueryVo storeInfo;
@ApiModelProperty(value = "拼团产品用户是否收藏")
private Boolean userCollect = false;
@ApiModelProperty(value = "拼团产品运费模板名称")
private String tempName;
@ApiModelProperty(value = "拼团产品属性信息")
private List<YxStoreProductAttrQueryVo> productAttr = new ArrayList();
@ApiModelProperty(value = "拼团产品属性值")
private Map<String, YxStoreProductAttrValue> productValue = new LinkedHashMap<>();
}

5
yshop-mall/src/main/java/co/yixiang/modules/product/service/dto/AttrValueDto.java
View File

@ -1,5 +1,6 @@
package co.yixiang.modules.product.service.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@ -9,6 +10,10 @@ import lombok.Data;
**/
@Data
public class AttrValueDto {
@ApiModelProperty(value = "属性")
private String attr;
@ApiModelProperty(value = "是否选择")
private Boolean check = false;
}

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

@ -20,6 +20,7 @@ import java.util.Map;
@Data
public class ProductVo{
@ApiModelProperty(value = "商品信息列表")
private List<YxStoreProductQueryVo> goodList = new ArrayList();
@ApiModelProperty(value = "商户ID，预留字段")
@ -43,6 +44,7 @@ public class ProductVo{
//todo
private List similarity = new ArrayList();
@ApiModelProperty(value = "商品信息")
private YxStoreProductQueryVo storeInfo;
@ApiModelProperty(value = "腾讯地图key")

2
yshop-mall/src/main/java/co/yixiang/modules/product/vo/YxStoreProductAttrQueryVo.java
View File

@ -32,8 +32,10 @@ public class YxStoreProductAttrQueryVo implements Serializable {
@ApiModelProperty(value = "属性值")
private String attrValues;
@ApiModelProperty(value = "属性值集合")
private List<AttrValueDto> attrValue;
@ApiModelProperty(value = "属性")
private List<String> attrValueArr;
}