gitee/mall4j
1
1
Fork 0
mirror of https://gitee.com/gz-yami/mall4j.git synced 2026-03-22 09:17:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

使用spring doc代替spring fox，openapi 3.0规范

Browse Source
This commit is contained in:
FrozenWatermelon
2023-02-21 11:45:40 +08:00
parent a906a9c369
commit 53a2d9644b
98 changed files with 788 additions and 1044 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/BasketItemDto.java
View File

@@ -13,7 +13,7 @@ package com.yami.shop.bean.app.dto;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.yami.shop.common.serializer.json.ImgJsonSerializer;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
@@ -22,10 +22,10 @@ import java.util.List;
@Data
public class BasketItemDto implements Serializable {
@ApiModelProperty(value = "购物车ID", required = true)
@Schema(description = "购物车ID" , required = true)
private Long basketId;
@ApiModelProperty(value = "店铺ID", required = true)
@Schema(description = "店铺ID" , required = true)
private Long shopId;
/**
@@ -34,35 +34,35 @@ public class BasketItemDto implements Serializable {
@JsonIgnore
private String shopName;
@ApiModelProperty(value = "产品ID", required = true)
@Schema(description = "产品ID" , required = true)
private Long prodId;
@ApiModelProperty(value = "skuID", required = true)
@Schema(description = "skuID" , required = true)
private Long skuId;
@ApiModelProperty(value = "产品个数", required = true)
@Schema(description = "产品个数" , required = true)
private Integer prodCount;
@ApiModelProperty(value = "产品名称", required = true)
@Schema(description = "产品名称" , required = true)
private String prodName;
@ApiModelProperty(value = "产品主图", required = true)
@Schema(description = "产品主图" , required = true)
@JsonSerialize(using = ImgJsonSerializer.class)
private String pic;
@ApiModelProperty(value = "产品现价", required = true)
@Schema(description = "产品现价" , required = true)
private Double price;
@ApiModelProperty(value = "产品原价", required = true)
@Schema(description = "产品原价" , required = true)
private Double oriPrice;
@ApiModelProperty(value = "产品简介", required = true)
@Schema(description = "产品简介" , required = true)
private String brief;
@ApiModelProperty(value = "产品sku信息", required = true)
@Schema(description = "产品sku信息" , required = true)
private String skuName;
@ApiModelProperty("参与满减活动列表")
@Schema(description = "参与满减活动列表" )
private List<DiscountDto> discounts;
}

10
yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/CategoryDto.java
View File

@@ -12,22 +12,22 @@ package com.yami.shop.bean.app.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.yami.shop.common.serializer.json.ImgJsonSerializer;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@Data
public class CategoryDto {
@ApiModelProperty(value = "分类id",required=true)
@Schema(description = "分类id" ,required=true)
private Long categoryId;
@ApiModelProperty(value = "分类父id",required=true)
@Schema(description = "分类父id" ,required=true)
private Long parentId;
@ApiModelProperty(value = "分类名称",required=true)
@Schema(description = "分类名称" ,required=true)
private String categoryName;
@ApiModelProperty(value = "分类图片",required=true)
@Schema(description = "分类图片" ,required=true)
@JsonSerialize(using = ImgJsonSerializer.class)
private String pic;

2
yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/CouponOrderDto.java
View File

@@ -11,7 +11,7 @@
package com.yami.shop.bean.app.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;

10
yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/DeliveryDto.java
View File

@@ -12,22 +12,22 @@ package com.yami.shop.bean.app.dto;
import java.util.List;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@Data
public class DeliveryDto {
@ApiModelProperty(value = "物流公司名称",required=true)
@Schema(description = "物流公司名称" ,required=true)
private String companyName;
@ApiModelProperty(value = "物流公司官网",required=true)
@Schema(description = "物流公司官网" ,required=true)
private String companyHomeUrl;
@ApiModelProperty(value = "物流订单号",required=true)
@Schema(description = "物流订单号" ,required=true)
private String dvyFlowId;
@ApiModelProperty(value = "查询出的物流信息",required=true)
@Schema(description = "查询出的物流信息" ,required=true)
private List<DeliveryInfoDto> data;
}

8
yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/DeliveryInfoDto.java
View File

@@ -10,21 +10,21 @@
package com.yami.shop.bean.app.dto;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@Data
public class DeliveryInfoDto {
@ApiModelProperty(value = "详细信息",required=true)
@Schema(description = "详细信息" ,required=true)
private String context;
private String ftime;
@ApiModelProperty(value = "快递所在区域",required=true)
@Schema(description = "快递所在区域" ,required=true)
private String location;
@ApiModelProperty(value = "物流更新时间",required=true)
@Schema(description = "物流更新时间" ,required=true)
private String time;
}

15
yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/IndexImgDto.java
View File

@@ -12,13 +12,12 @@ package com.yami.shop.bean.app.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.yami.shop.common.serializer.json.ImgJsonSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.util.Date;
@ApiModel("首页图片对象")
@Schema(description = "首页图片对象")
@Data
public class IndexImgDto {
@@ -26,31 +25,31 @@ public class IndexImgDto {
* 图片
*/
@JsonSerialize(using = ImgJsonSerializer.class)
@ApiModelProperty(value = "图片Url", required = true)
@Schema(description = "图片Url" , required = true)
private String imgUrl;
/**
* 顺序
*/
@ApiModelProperty(value = "图片顺序", required = true)
@Schema(description = "图片顺序" , required = true)
private Integer seq;
/**
* 上传时间
*/
@ApiModelProperty(value = "上传时间", required = true)
@Schema(description = "上传时间" , required = true)
private Date uploadTime;
/**
* 类型
*/
@ApiModelProperty(value = "类型", required = true)
@Schema(description = "类型" , required = true)
private int type;
/**
* 关联id
*/
@ApiModelProperty(value = "关联id", required = true)
@Schema(description = "关联id" , required = true)
private Long relation;

13
yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/MyOrderDto.java
View File

@@ -12,24 +12,23 @@ package com.yami.shop.bean.app.dto;
import java.util.List;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@Data
@ApiModel("我的订单")
@Schema(description = "我的订单")
public class MyOrderDto {
@ApiModelProperty(value = "订单项",required=true)
@Schema(description = "订单项" ,required=true)
private List<MyOrderItemDto> orderItemDtos;
@ApiModelProperty(value = "订单号",required=true)
@Schema(description = "订单号" ,required=true)
private String orderNumber;
@ApiModelProperty(value = "总价",required=true)
@Schema(description = "总价" ,required=true)
private Double actualTotal;
@ApiModelProperty(value = "订单状态",required=true)
@Schema(description = "订单状态" ,required=true)
private Integer status;
}

15
yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/MyOrderItemDto.java
View File

@@ -12,28 +12,27 @@ package com.yami.shop.bean.app.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.yami.shop.common.serializer.json.ImgJsonSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@ApiModel("我的订单-订单项")
@Schema(description = "我的订单-订单项")
@Data
public class MyOrderItemDto {
@ApiModelProperty(value = "商品图片", required = true)
@Schema(description = "商品图片" , required = true)
@JsonSerialize(using = ImgJsonSerializer.class)
private String pic;
@ApiModelProperty(value = "商品名称", required = true)
@Schema(description = "商品名称" , required = true)
private String prodName;
@ApiModelProperty(value = "商品数量", required = true)
@Schema(description = "商品数量" , required = true)
private Integer prodCount;
@ApiModelProperty(value = "商品价格", required = true)
@Schema(description = "商品价格" , required = true)
private Double price;
@ApiModelProperty(value = "skuName", required = true)
@Schema(description = "skuName" , required = true)
private String skuName;
}

15
yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/NoticeDto.java
View File

@@ -11,34 +11,33 @@
package com.yami.shop.bean.app.dto;
import com.fasterxml.jackson.annotation.JsonView;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.util.Date;
@ApiModel("公告对象")
@Schema(description = "公告对象")
@Data
public class NoticeDto {
@JsonView(NoContent.class)
@ApiModelProperty(value = "公告id")
@Schema(description = "公告id" )
private Long id;
@JsonView(NoContent.class)
@ApiModelProperty(value = "店铺id")
@Schema(description = "店铺id" )
private Long shopId;
@JsonView(NoContent.class)
@ApiModelProperty(value = "标题")
@Schema(description = "标题" )
private String title;
@ApiModelProperty(value = "公告内容")
@Schema(description = "公告内容" )
@JsonView(WithContent.class)
private String content;
@JsonView(NoContent.class)
@ApiModelProperty(value = "公告发布时间")
@Schema(description = "公告发布时间" )
private Date publishTime;
public static interface NoContent{}

19
yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/OrderCountData.java
View File

@@ -10,33 +10,32 @@
package com.yami.shop.bean.app.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@Data
@ApiModel("我的订单数量")
@Schema(description = "我的订单数量")
public class OrderCountData {
@ApiModelProperty(value = "所有订单数量")
@Schema(description = "所有订单数量" )
private Integer allCount;
@ApiModelProperty(value = "待付款")
@Schema(description = "待付款" )
private Integer unPay;
@ApiModelProperty(value = "待发货")
@Schema(description = "待发货" )
private Integer payed;
@ApiModelProperty(value = "待收货")
@Schema(description = "待收货" )
private Integer consignment;
@ApiModelProperty(value = "待评价")
@Schema(description = "待评价" )
private Integer confirm;
@ApiModelProperty(value = "成功")
@Schema(description = "成功" )
private Integer success;
@ApiModelProperty(value = "失败")
@Schema(description = "失败" )
private Integer close;

4
yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/OrderNumbersDto.java
View File

@@ -10,13 +10,13 @@
package com.yami.shop.bean.app.dto;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@Data
public class OrderNumbersDto {
@ApiModelProperty(value = "多个订单号拼接的字符串",required=true)
@Schema(description = "多个订单号拼接的字符串" ,required=true)
private String orderNumbers;
public OrderNumbersDto(String orderNumbers) {

30
yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/OrderShopDto.java
View File

@@ -17,7 +17,7 @@ import java.util.List;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
/**
* 订单下的每个店铺
@@ -30,58 +30,58 @@ public class OrderShopDto implements Serializable {
/**
* 店铺ID
**/
@ApiModelProperty(value = "店铺id", required = true)
@Schema(description = "店铺id" , required = true)
private Long shopId;
/**
* 店铺名称
**/
@ApiModelProperty(value = "店铺名称", required = true)
@Schema(description = "店铺名称" , required = true)
private String shopName;
@ApiModelProperty(value = "实际总值", required = true)
@Schema(description = "实际总值" , required = true)
private Double actualTotal;
@ApiModelProperty(value = "商品总值", required = true)
@Schema(description = "商品总值" , required = true)
private Double total;
@ApiModelProperty(value = "商品总数", required = true)
@Schema(description = "商品总数" , required = true)
private Integer totalNum;
@ApiModelProperty(value = "地址Dto", required = true)
@Schema(description = "地址Dto" , required = true)
private UserAddrDto userAddrDto;
@ApiModelProperty(value = "产品信息", required = true)
@Schema(description = "产品信息" , required = true)
private List<OrderItemDto> orderItemDtos;
@ApiModelProperty(value = "运费", required = true)
@Schema(description = "运费" , required = true)
private Double transfee;
@ApiModelProperty(value = "优惠总额", required = true)
@Schema(description = "优惠总额" , required = true)
private Double reduceAmount;
@ApiModelProperty(value = "促销活动优惠金额", required = true)
@Schema(description = "促销活动优惠金额" , required = true)
private Double discountMoney;
@ApiModelProperty(value = "优惠券优惠金额", required = true)
@Schema(description = "优惠券优惠金额" , required = true)
private Double couponMoney;
/**
* 创建时间
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "订单创建时间", required = true)
@Schema(description = "订单创建时间" , required = true)
private Date createTime;
/**
* 订单备注信息
*/
@ApiModelProperty(value = "订单备注信息", required = true)
@Schema(description = "订单备注信息" , required = true)
private String remarks;
/**
* 订单状态
*/
@ApiModelProperty(value = "订单状态", required = true)
@Schema(description = "订单状态" , required = true)
private Integer status;
}

17
yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ProdCommDataDto.java
View File

@@ -10,31 +10,30 @@
package com.yami.shop.bean.app.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@ApiModel("商品评论数据")
@Schema(description = "商品评论数据")
@Data
public class ProdCommDataDto {
@ApiModelProperty(value = "好评率")
@Schema(description = "好评率" )
private Double positiveRating;
@ApiModelProperty(value = "评论数量")
@Schema(description = "评论数量" )
private Integer number;
@ApiModelProperty(value = "好评数")
@Schema(description = "好评数" )
private Integer praiseNumber;
@ApiModelProperty(value = "中评数")
@Schema(description = "中评数" )
private Integer secondaryNumber;
@ApiModelProperty(value = "差评数")
@Schema(description = "差评数" )
private Integer negativeNumber;
@ApiModelProperty(value = "有图数")
@Schema(description = "有图数" )
private Integer picNumber;
}

29
yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ProdCommDto.java
View File

@@ -14,43 +14,42 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.yami.shop.common.serializer.json.EmojiJsonSerializer;
import com.yami.shop.common.serializer.json.ImgJsonSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
import java.util.List;
@ApiModel("评论对象")
@Schema(description = "评论对象")
@Data
public class ProdCommDto {
@ApiModelProperty(value = "id")
@Schema(description = "id" )
private Long prodCommId;
/**
* 得分，0-5分
*/
@ApiModelProperty(value = "得分，0-5分")
@Schema(description = "得分，0-5分" )
private Integer score;
/**
* 是否匿名(1:是 0:否)
*/
@ApiModelProperty(value = "是否匿名(1:是 0:否)")
@Schema(description = "是否匿名(1:是 0:否)" )
private Integer isAnonymous;
/**
* 掌柜回复
*/
@ApiModelProperty(value = "掌柜回复")
@Schema(description = "掌柜回复" )
private String replyContent;
/**
* 记录时间
*/
@ApiModelProperty(value = "记录时间")
@Schema(description = "记录时间" )
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date recTime;
@@ -58,40 +57,40 @@ public class ProdCommDto {
/**
* 回复时间
*/
@ApiModelProperty(value = "回复时间")
@Schema(description = "回复时间" )
@JsonFormat(pattern = "yyyy-MM-dd")
private Date replyTime;
@JsonSerialize(using = EmojiJsonSerializer.class)
@ApiModelProperty(value = "用户昵称")
@Schema(description = "用户昵称" )
private String nickName;
/**
* 头像图片路径
*/
@ApiModelProperty(value = "头像图片路径")
@Schema(description = "头像图片路径" )
private String pic;
/**
* 是否回复 0:未回复 1:已回复
*/
@ApiModelProperty(value = "商家是否回复 0:未回复 1:已回复")
@Schema(description = "商家是否回复 0:未回复 1:已回复" )
private Integer replySts;
/**
* 评论图片
*/
@JsonSerialize(using = ImgJsonSerializer.class)
@ApiModelProperty(value = "评论图片")
@Schema(description = "评论图片" )
private String pics;
/**
* 评价等级
*/
@ApiModelProperty(value = "0好评 1中评 2差评")
@Schema(description = "0好评 1中评 2差评" )
private Byte evaluate;
@ApiModelProperty(value = "评论内容")
@Schema(description = "评论内容" )
private String content;
}

10
yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ProdTagDto.java
View File

@@ -10,22 +10,22 @@
package com.yami.shop.bean.app.dto;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@Data
public class ProdTagDto {
@ApiModelProperty(value = "分组标签id")
@Schema(description = "分组标签id" )
private Long id;
@ApiModelProperty(value = "分组标签标题")
@Schema(description = "分组标签标题" )
private String title;
@ApiModelProperty(value = "排序（数值越高越靠前）")
@Schema(description = "排序（数值越高越靠前）" )
private String seq;
@ApiModelProperty(value = "列表样式(0:一列一个,1:一列两个,2:一列三个)")
@Schema(description = "列表样式(0:一列一个,1:一列两个,2:一列三个)" )
private String style;
}

30
yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ProductDto.java
View File

@@ -16,7 +16,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.yami.shop.bean.model.Transport;
import com.yami.shop.common.serializer.json.ImgJsonSerializer;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@Data
@@ -24,78 +24,78 @@ public class ProductDto {
/**
* 店铺ID
*/
@ApiModelProperty(value = "店铺ID", required = true)
@Schema(description = "店铺ID" , required = true)
private Long shopId;
/**
* 店铺名称
*/
@ApiModelProperty(value = "店铺名称", required = true)
@Schema(description = "店铺名称" , required = true)
private String shopName;
/**
* 商品ID
*/
@ApiModelProperty(value = "商品ID", required = true)
@Schema(description = "商品ID" , required = true)
private Long prodId;
/**
* 商品名称
*/
@ApiModelProperty(value = "商品名称")
@Schema(description = "商品名称" )
private String prodName;
/**
* 商品价格
*/
@ApiModelProperty(value = "商品价格", required = true)
@Schema(description = "商品价格" , required = true)
private Double price;
/**
* 商品详情
*/
@ApiModelProperty(value = "详细描述")
@Schema(description = "详细描述" )
private String content;
/**
* 商品原价
*/
@ApiModelProperty(value = "商品原价", required = true)
@Schema(description = "商品原价" , required = true)
private Double oriPrice;
/**
* 库存量
*/
@ApiModelProperty(value = "库存量", required = true)
@Schema(description = "库存量" , required = true)
private Integer totalStocks;
/**
* 简要描述,卖点等
*/
@ApiModelProperty(value = "简要描述,卖点等", required = true)
@Schema(description = "简要描述,卖点等" , required = true)
private String brief;
/**
* 商品主图
*/
@JsonSerialize(using = ImgJsonSerializer.class)
@ApiModelProperty(value = "商品主图", required = true)
@Schema(description = "商品主图" , required = true)
private String pic;
@JsonSerialize(using = ImgJsonSerializer.class)
@ApiModelProperty(value = "商品图片列表，以逗号分割", required = true)
@Schema(description = "商品图片列表，以逗号分割" , required = true)
private String imgs;
/**
* 商品分类
*/
@ApiModelProperty(value = "商品分类id", required = true)
@Schema(description = "商品分类id" , required = true)
private Long categoryId;
@ApiModelProperty(value = "sku列表")
@Schema(description = "sku列表" )
private List<SkuDto> skuList;
@ApiModelProperty(value = "运费信息", required = true)
@Schema(description = "运费信息" , required = true)
private Transport transport;
public static interface WithNoContent{}

28
yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ProductItemDto.java
View File

@@ -13,7 +13,7 @@ package com.yami.shop.bean.app.dto;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.yami.shop.common.serializer.json.ImgJsonSerializer;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
@@ -26,43 +26,43 @@ import java.util.List;
@Data
public class ProductItemDto implements Serializable {
@ApiModelProperty(value = "产品名称",required=true)
@Schema(description = "产品名称" ,required=true)
private String prodName;
@ApiModelProperty(value = "产品个数",required=true)
@Schema(description = "产品个数" ,required=true)
private Integer prodCount;
@ApiModelProperty(value = "产品图片路径",required=true)
@Schema(description = "产品图片路径" ,required=true)
@JsonSerialize(using = ImgJsonSerializer.class)
private String pic;
@ApiModelProperty(value = "产品价格",required=true)
@Schema(description = "产品价格" ,required=true)
private Double price;
@ApiModelProperty(value = "商品总金额",required=true)
@Schema(description = "商品总金额" ,required=true)
private Double productTotalAmount;
@ApiModelProperty(value = "产品ID",required=true)
@Schema(description = "产品ID" ,required=true)
private Long prodId;
@ApiModelProperty(value = "skuId",required=true)
@Schema(description = "skuId" ,required=true)
private Long skuId;
@ApiModelProperty(value = "规格名称", required = true)
@Schema(description = "规格名称" , required = true)
private String skuName;
@ApiModelProperty(value = "basketId",required=true)
@Schema(description = "basketId" ,required=true)
private Long basketId;
@ApiModelProperty(value = "商品实际金额 = 商品总金额 - 分摊的优惠金额")
@Schema(description = "商品实际金额 = 商品总金额 - 分摊的优惠金额" )
private Double actualTotal;
@ApiModelProperty(value = "满减满折优惠id，0不主动参与活动（用户没有主动参与该活动），-1主动不参与活动")
@Schema(description = "满减满折优惠id，0不主动参与活动（用户没有主动参与该活动），-1主动不参与活动" )
private Long discountId = 0L;
@ApiModelProperty(value = "分摊的优惠金额")
@Schema(description = "分摊的优惠金额" )
private Double shareReduce;
@ApiModelProperty("参与满减活动列表")
@Schema(description = "参与满减活动列表" )
private List<DiscountDto> discounts = new ArrayList<>();
}

13
yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartAmountDto.java
View File

@@ -10,23 +10,22 @@
package com.yami.shop.bean.app.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@Data
@ApiModel("购物车合计")
@Schema(description = "购物车合计")
public class ShopCartAmountDto {
@ApiModelProperty("总额")
@Schema(description = "总额" )
private Double totalMoney;
@ApiModelProperty("总计")
@Schema(description = "总计" )
private Double finalMoney;
@ApiModelProperty("减额")
@Schema(description = "减额" )
private Double subtractMoney;
@ApiModelProperty("商品数量")
@Schema(description = "商品数量" )
private Integer count;
}

8
yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartDto.java
View File

@@ -10,7 +10,7 @@
package com.yami.shop.bean.app.dto;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
@@ -19,13 +19,13 @@ import java.util.List;
@Data
public class ShopCartDto implements Serializable {
@ApiModelProperty(value = "店铺ID", required = true)
@Schema(description = "店铺ID" , required = true)
private Long shopId;
@ApiModelProperty(value = "店铺名称", required = true)
@Schema(description = "店铺名称" , required = true)
private String shopName;
@ApiModelProperty(value = "购物车商品", required = true)
@Schema(description = "购物车商品" , required = true)
private List<ShopCartItemDiscountDto> shopCartItemDiscounts;

11
yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartExpiryItemDto.java
View File

@@ -10,22 +10,21 @@
package com.yami.shop.bean.app.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.util.List;
@Data
@ApiModel("购物车失效商品对象")
@Schema(description = "购物车失效商品对象")
public class ShopCartExpiryItemDto {
@ApiModelProperty(value = "店铺ID", required = true)
@Schema(description = "店铺ID" , required = true)
private Long shopId;
@ApiModelProperty(value = "店铺名称", required = true)
@Schema(description = "店铺名称" , required = true)
private String shopName;
@ApiModelProperty(value = "商品项", required = true)
@Schema(description = "商品项" , required = true)
private List<ShopCartItemDto> shopCartItemDtoList;
}

6
yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartItemDiscountDto.java
View File

@@ -10,7 +10,7 @@
package com.yami.shop.bean.app.dto;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
@@ -20,9 +20,9 @@ import java.util.List;
public class ShopCartItemDiscountDto implements Serializable {
@ApiModelProperty(value = "已选满减项", required = true)
@Schema(description = "已选满减项" , required = true)
private ChooseDiscountItemDto chooseDiscountItemDto;
@ApiModelProperty(value = "商品列表")
@Schema(description = "商品列表" )
private List<ShopCartItemDto> shopCartItems;
}

16
yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartItemDto.java
View File

@@ -12,7 +12,7 @@ package com.yami.shop.bean.app.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.yami.shop.common.serializer.json.ImgJsonSerializer;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -29,24 +29,24 @@ import java.util.List;
public class ShopCartItemDto extends ProductItemDto implements Serializable {
private static final long serialVersionUID = -8284981156242930909L;
@ApiModelProperty(value = "购物车ID", required = true)
@Schema(description = "购物车ID" , required = true)
private Long basketId;
@ApiModelProperty(value = "店铺ID", required = true)
@Schema(description = "店铺ID" , required = true)
private Long shopId;
@ApiModelProperty(value = "规格名称", required = true)
@Schema(description = "规格名称" , required = true)
private String skuName;
@ApiModelProperty(value = "店铺名称", required = true)
@Schema(description = "店铺名称" , required = true)
private String shopName;
@ApiModelProperty(value = "商品原价", required = true)
@Schema(description = "商品原价" , required = true)
private Double oriPrice;
@ApiModelProperty(value = "推广员使用的推销卡号")
@Schema(description = "推广员使用的推销卡号" )
private String distributionCardNo;
@ApiModelProperty(value = "加入购物车的时间")
@Schema(description = "加入购物车的时间" )
private Date basketDate;
}

28
yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartOrderDto.java
View File

@@ -10,7 +10,7 @@
package com.yami.shop.bean.app.dto;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
@@ -22,42 +22,42 @@ import java.util.List;
@Data
public class ShopCartOrderDto implements Serializable{
@ApiModelProperty(value = "店铺id", required = true)
@Schema(description = "店铺id" , required = true)
private Long shopId;
@ApiModelProperty(value = "店铺名称", required = true)
@Schema(description = "店铺名称" , required = true)
private String shopName;
@ApiModelProperty(value = "实际总值", required = true)
@Schema(description = "实际总值" , required = true)
private Double actualTotal;
@ApiModelProperty(value = "商品总值", required = true)
@Schema(description = "商品总值" , required = true)
private Double total;
@ApiModelProperty(value = "商品总数", required = true)
@Schema(description = "商品总数" , required = true)
private Integer totalCount;
@ApiModelProperty(value = "运费", required = true)
@Schema(description = "运费" , required = true)
private Double transfee;
@ApiModelProperty(value = "促销活动优惠金额", required = true)
@Schema(description = "促销活动优惠金额" , required = true)
private Double discountReduce;
@ApiModelProperty(value = "优惠券优惠金额", required = true)
@Schema(description = "优惠券优惠金额" , required = true)
private Double couponReduce;
@ApiModelProperty(value = "店铺优惠金额(促销活动 + 优惠券 + 其他)", required = true)
@Schema(description = "店铺优惠金额(促销活动 + 优惠券 + 其他)" , required = true)
private Double shopReduce = 0.0;
@ApiModelProperty(value = "订单备注信息", required = true)
@Schema(description = "订单备注信息" , required = true)
private String remarks;
@ApiModelProperty(value = "购物车商品", required = true)
@Schema(description = "购物车商品" , required = true)
private List<ShopCartItemDiscountDto> shopCartItemDiscounts;
@ApiModelProperty(value = "整个店铺可以使用的优惠券列表", required = true)
@Schema(description = "整个店铺可以使用的优惠券列表" , required = true)
private List<CouponOrderDto> coupons;
@ApiModelProperty(value = "订单编号", required = true)
@Schema(description = "订单编号" , required = true)
private String orderNumber;
}

16
yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartOrderMergerDto.java
View File

@@ -10,7 +10,7 @@
package com.yami.shop.bean.app.dto;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
@@ -23,24 +23,24 @@ import java.util.List;
@Data
public class ShopCartOrderMergerDto implements Serializable{
@ApiModelProperty(value = "实际总值", required = true)
@Schema(description = "实际总值" , required = true)
private Double actualTotal;
@ApiModelProperty(value = "商品总值", required = true)
@Schema(description = "商品总值" , required = true)
private Double total;
@ApiModelProperty(value = "商品总数", required = true)
@Schema(description = "商品总数" , required = true)
private Integer totalCount;
@ApiModelProperty(value = "订单优惠金额(所有店铺优惠金额相加)", required = true)
@Schema(description = "订单优惠金额(所有店铺优惠金额相加)" , required = true)
private Double orderReduce;
@ApiModelProperty(value = "地址Dto", required = true)
@Schema(description = "地址Dto" , required = true)
private UserAddrDto userAddr;
@ApiModelProperty(value = "每个店铺的购物车信息", required = true)
@Schema(description = "每个店铺的购物车信息" , required = true)
private List<ShopCartOrderDto> shopCartOrders;
@ApiModelProperty(value = "整个订单可以使用的优惠券列表", required = true)
@Schema(description = "整个订单可以使用的优惠券列表" , required = true)
private List<CouponOrderDto> coupons;
}

16
yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/SkuDto.java
View File

@@ -12,7 +12,7 @@ package com.yami.shop.bean.app.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.yami.shop.common.serializer.json.ImgJsonSerializer;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
@@ -22,23 +22,23 @@ public class SkuDto implements Serializable {
private static final long serialVersionUID = 6457261945829470666L;
@ApiModelProperty(value = "skuId", required = true)
@Schema(description = "skuId" , required = true)
private Long skuId;
@ApiModelProperty(value = "价格", required = true)
@Schema(description = "价格" , required = true)
private Double price;
@ApiModelProperty(value = "原价")
@Schema(description = "原价" )
private Double oriPrice;
@ApiModelProperty(value = "库存(-1表示无穷)", required = true)
@Schema(description = "库存(-1表示无穷)" , required = true)
private Integer stocks;
@ApiModelProperty(value = "sku名称", required = true)
@Schema(description = "sku名称" , required = true)
private String skuName;
@ApiModelProperty(value = "图片")
@Schema(description = "图片" )
@JsonSerialize(using = ImgJsonSerializer.class)
private String pic;
@ApiModelProperty(value = "销售属性组合字符串,格式是p1:v1;p2:v2", required = true)
@Schema(description = "销售属性组合字符串,格式是p1:v1;p2:v2" , required = true)
private String properties;
}

10
yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/TagProductDto.java
View File

@@ -11,7 +11,7 @@
package com.yami.shop.bean.app.dto;
import com.yami.shop.bean.model.ProdTag;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.util.List;
@@ -19,16 +19,16 @@ import java.util.List;
@Data
public class TagProductDto {
@ApiModelProperty(value = "分组标签id")
@Schema(description = "分组标签id" )
private Long id;
@ApiModelProperty(value = "分组标签标题")
@Schema(description = "分组标签标题" )
private String title;
@ApiModelProperty(value = "排序（数值越高越靠前）")
@Schema(description = "排序（数值越高越靠前）" )
private String seq;
@ApiModelProperty(value = "列表样式(0:一列一个,1:一列两个,2:一列三个)")
@Schema(description = "列表样式(0:一列一个,1:一列两个,2:一列三个)" )
private String style;
private List<ProductDto> productDtoList;

24
yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/UserAddrDto.java
View File

@@ -10,52 +10,52 @@
package com.yami.shop.bean.app.dto;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
@Data
public class UserAddrDto implements Serializable {
@ApiModelProperty(value = "地址id", required = true)
@Schema(description = "地址id" , required = true)
private Long addrId;
@ApiModelProperty(value = "收货人", required = true)
@Schema(description = "收货人" , required = true)
private String receiver;
@ApiModelProperty(value = "省", required = true)
@Schema(description = "省" , required = true)
private String province;
@ApiModelProperty(value = "城市", required = true)
@Schema(description = "城市" , required = true)
private String city;
@ApiModelProperty(value = "区", required = true)
@Schema(description = "区" , required = true)
private String area;
@ApiModelProperty(value = "地址", required = true)
@Schema(description = "地址" , required = true)
private String addr;
@ApiModelProperty(value = "手机", required = true)
@Schema(description = "手机" , required = true)
private String mobile;
@ApiModelProperty(value = "是否默认地址（1:是 0：否） ", required = true)
@Schema(description = "是否默认地址（1:是 0：否） " , required = true)
private Integer commonAddr;
/**
* 省ID
*/
@ApiModelProperty(value = "省ID", required = true)
@Schema(description = "省ID" , required = true)
private Long provinceId;
/**
* 城市ID
*/
@ApiModelProperty(value = "城市ID", required = true)
@Schema(description = "城市ID" , required = true)
private Long cityId;
/**
* 区域ID
*/
@ApiModelProperty(value = "区域ID", required = true)
@Schema(description = "区域ID" , required = true)
private Long areaId;
}

11
yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/UserCollectionDto.java
View File

@@ -10,23 +10,22 @@
package com.yami.shop.bean.app.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.util.Date;
@ApiModel("收藏对象")
@Schema(description = "收藏对象")
@Data
public class UserCollectionDto {
@ApiModelProperty(value = "收藏id")
@Schema(description = "收藏id" )
private Long id;
@ApiModelProperty(value = "商品名称")
@Schema(description = "商品名称" )
private String prodName;
@ApiModelProperty(value = "收藏时间")
@Schema(description = "收藏时间" )
private Date createTime;
}

8
yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/UserDto.java
View File

@@ -10,14 +10,14 @@
package com.yami.shop.bean.app.dto;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
public class UserDto {
@ApiModelProperty(value = "用户状态：0禁用 1正常",required=true)
@Schema(description = "用户状态：0禁用 1正常" ,required=true)
private Integer status;
@ApiModelProperty(value = "token",required=true)
@Schema(description = "token" ,required=true)
private String token;
public Integer getStatus() {
@@ -33,4 +33,4 @@ public class UserDto {
this.token = token;
}
}
}

27
yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/AddrParam.java
View File

@@ -12,52 +12,51 @@ package com.yami.shop.bean.app.param;
import javax.validation.constraints.NotNull;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
@ApiModel(value= "地址参数")
@Schema(description = "地址参数")
public class AddrParam {
@ApiModelProperty(value = "地址ID",required=true)
@Schema(description = "地址ID" ,required=true)
private Long addrId;
@NotNull(message = "收货人不能为空")
@ApiModelProperty(value = "收货人",required=true)
@Schema(description = "收货人" ,required=true)
private String receiver;
@NotNull(message = "地址不能为空")
@ApiModelProperty(value = "地址",required=true)
@Schema(description = "地址" ,required=true)
private String addr;
@ApiModelProperty(value = "邮编",required=false)
@Schema(description = "邮编" ,required=false)
private String postCode;
@NotNull(message = "手机不能为空")
@ApiModelProperty(value = "手机",required=true)
@Schema(description = "手机" ,required=true)
private String mobile;
@NotNull(message = "省ID不能为空")
@ApiModelProperty(value = "省ID",required=true)
@Schema(description = "省ID" ,required=true)
private Long provinceId;
@NotNull(message = "城市ID不能为空")
@ApiModelProperty(value = "城市ID",required=true)
@Schema(description = "城市ID" ,required=true)
private Long cityId;
@NotNull(message = "区ID不能为空")
@ApiModelProperty(value = "区ID",required=true)
@Schema(description = "区ID" ,required=true)
private Long areaId;
@NotNull(message = "省不能为空")
@ApiModelProperty(value = "省",required=true)
@Schema(description = "省" ,required=true)
private String province;
@NotNull(message = "城市不能为空")
@ApiModelProperty(value = "城市",required=true)
@Schema(description = "城市" ,required=true)
private String city;
@NotNull(message = "区不能为空")
@ApiModelProperty(value = "区",required=true)
@Schema(description = "区" ,required=true)
private String area;

14
yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/ChangeShopCartParam.java
View File

@@ -12,7 +12,7 @@ package com.yami.shop.bean.app.param;
import javax.validation.constraints.NotNull;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
/**
@@ -21,25 +21,25 @@ import lombok.Data;
@Data
public class ChangeShopCartParam {
@ApiModelProperty(value = "购物车ID", required = true)
@Schema(description = "购物车ID" , required = true)
private Long basketId;
@NotNull(message = "商品ID不能为空")
@ApiModelProperty(value = "商品ID", required = true)
@Schema(description = "商品ID" , required = true)
private Long prodId;
@NotNull(message = "skuId不能为空")
@ApiModelProperty(value = "skuId", required = true)
@Schema(description = "skuId" , required = true)
private Long skuId;
@NotNull(message = "店铺ID不能为空")
@ApiModelProperty(value = "店铺ID", required = true)
@Schema(description = "店铺ID" , required = true)
private Long shopId;
@NotNull(message = "商品个数不能为空")
@ApiModelProperty(value = "商品个数", required = true)
@Schema(description = "商品个数" , required = true)
private Integer count;
@ApiModelProperty(value = "分销推广人卡号")
@Schema(description = "分销推广人卡号" )
private String distributionCardNo;
}

11
yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/LoginParam.java
View File

@@ -10,17 +10,16 @@
package com.yami.shop.bean.app.param;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
@ApiModel(value= "登陆参数")
@Schema(description = "登陆参数")
public class LoginParam {
@ApiModelProperty(value = "小程序登陆时返回的code(使用code登陆必填)",required=true)
@Schema(description = "小程序登陆时返回的code(使用code登陆必填)" ,required=true)
private String code;
@ApiModelProperty(value = "登陆时的用户名(账号密码登陆必填)",required=true)
@Schema(description = "登陆时的用户名(账号密码登陆必填)" ,required=true)
private String mobile;
@ApiModelProperty(value = "登陆时的密码(账号密码登陆必填)",required=true)
@Schema(description = "登陆时的密码(账号密码登陆必填)" ,required=true)
private String password;
public String getCode() {

15
yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderItemParam.java
View File

@@ -13,31 +13,30 @@ package com.yami.shop.bean.app.param;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@Data
@ApiModel(value= "购物车物品参数")
@Schema(description = "购物车物品参数")
public class OrderItemParam {
@NotNull(message = "产品ID不能为空")
@ApiModelProperty(value = "产品ID",required=true)
@Schema(description = "产品ID" ,required=true)
private Long prodId;
@NotNull(message = "skuId不能为空")
@ApiModelProperty(value = "skuId",required=true)
@Schema(description = "skuId" ,required=true)
private Long skuId;
@NotNull(message = "产品数量不能为空")
@Min(value = 1,message = "产品数量不能为空")
@ApiModelProperty(value = "产品数量",required=true)
@Schema(description = "产品数量" ,required=true)
private Integer prodCount;
@NotNull(message = "店铺id不能为空")
@ApiModelProperty(value = "店铺id",required=true)
@Schema(description = "店铺id" ,required=true)
private Long shopId;
@ApiModelProperty(value = "推广员使用的推销卡号")
@Schema(description = "推广员使用的推销卡号" )
private String distributionCardNo;
}

19
yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderParam.java
View File

@@ -16,34 +16,33 @@ import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import com.yami.shop.bean.enums.OrderEntry;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@Data
@ApiModel(value= "订单参数")
@Schema(description = "订单参数")
public class OrderParam {
@ApiModelProperty(value = "购物车id 数组")
@Schema(description = "购物车id 数组" )
private List<Long> basketIds;
@ApiModelProperty(value = "立即购买时提交的商品项")
@Schema(description = "立即购买时提交的商品项" )
private OrderItemParam orderItem;
@ApiModelProperty(value = "地址ID，0为默认地址",required=true)
@Schema(description = "地址ID，0为默认地址" ,required=true)
@NotNull(message = "地址不能为空")
private Long addrId;
@ApiModelProperty(value = "用户是否改变了优惠券的选择，如果用户改变了优惠券的选择，则完全根据传入参数进行优惠券的选择")
@Schema(description = "用户是否改变了优惠券的选择，如果用户改变了优惠券的选择，则完全根据传入参数进行优惠券的选择" )
private Integer userChangeCoupon;
@ApiModelProperty(value = "优惠券id数组")
@Schema(description = "优惠券id数组" )
private List<Long> couponIds;
// @ApiModelProperty(value = "每次订单提交时的uuid")
// @Schema(description = "每次订单提交时的uuid" )
// private String uuid;
// @ApiModelProperty(value = "订单入口 SHOP_CART购物车，BUY_NOW立即购买")
// @Schema(description = "订单入口 SHOP_CART购物车，BUY_NOW立即购买" )
// private OrderEntry orderEntry;

8
yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderRefundExpressParam.java
View File

@@ -1,6 +1,6 @@
package com.yami.shop.bean.app.param;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import javax.validation.constraints.NotEmpty;
@@ -8,15 +8,15 @@ import javax.validation.constraints.NotEmpty;
@Data
public class OrderRefundExpressParam {
@ApiModelProperty(value = "退款编号名称", required = true)
@Schema(description = "退款编号名称" , required = true)
@NotEmpty(message = "退款编号不能为空")
private String refundSn;
@ApiModelProperty(value = "物流公司名称", required = true)
@Schema(description = "物流公司名称" , required = true)
@NotEmpty(message = "物流公司名称不能为空")
private String expressName;
@ApiModelProperty(value = "物流单号", required = true)
@Schema(description = "物流单号" , required = true)
@NotEmpty(message = "物流单号不能为空")
private String expressNo;

16
yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderRefundParam.java
View File

@@ -1,6 +1,6 @@
package com.yami.shop.bean.app.param;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import javax.validation.constraints.NotEmpty;
@@ -9,30 +9,30 @@ import javax.validation.constraints.NotNull;
@Data
public class OrderRefundParam {
@ApiModelProperty(value = "订单编号", required = true)
@Schema(description = "订单编号" , required = true)
@NotEmpty(message = "订单编号不能为空")
private String orderNumber;
@ApiModelProperty(value = "申请类型(1:仅退款 2退款退货)", required = true)
@Schema(description = "申请类型(1:仅退款 2退款退货)" , required = true)
@NotNull(message = "申请类型不能为空")
private Integer applyType;
// @ApiModelProperty(value = "订单金额", required = true)
// @Schema(description = "订单金额" , required = true)
// @NotNull(message = "订单金额不能为空")
// private Double orderAmount;
@ApiModelProperty(value = "订单项id(全部退款是0)", required = true)
@Schema(description = "订单项id(全部退款是0)" , required = true)
@NotNull(message = "订单项id不能为空")
private Long orderItemId;
// @ApiModelProperty(value = "退款金额", required = true)
// @Schema(description = "退款金额" , required = true)
// @NotNull(message = "退款金额不能为空")
// private BigDecimal refundAmount;
@ApiModelProperty(value = "凭证图片列表", required = true)
@Schema(description = "凭证图片列表" , required = true)
private String photoFiles;
@ApiModelProperty(value = "申请原因", required = true)
@Schema(description = "申请原因" , required = true)
@NotEmpty(message = "订单编号不能为空")
private String buyerMsg;

6
yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderShopParam.java
View File

@@ -10,18 +10,18 @@
package com.yami.shop.bean.app.param;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
public class OrderShopParam {
/** 店铺ID **/
@ApiModelProperty(value = "店铺id",required=true)
@Schema(description = "店铺id" ,required=true)
private Long shopId;
/**
* 订单备注信息
*/
@ApiModelProperty(value = "订单备注信息",required=true)
@Schema(description = "订单备注信息" ,required=true)
private String remarks;
public Long getShopId() {

9
yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/PayParam.java
View File

@@ -13,24 +13,23 @@ package com.yami.shop.bean.app.param;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
@ApiModel(value= "支付参数")
@Schema(description = "支付参数")
public class PayParam {
/**
* 订单号
*/
@NotBlank(message="订单号不能为空")
@ApiModelProperty(value = "订单号",required=true)
@Schema(description = "订单号" ,required=true)
private String orderNumbers;
/**
* 支付方式
*/
@NotNull(message="支付方式不能为空")
@ApiModelProperty(value = "支付方式 (1:微信支付 2:支付宝)",required=true)
@Schema(description = "支付方式 (1:微信支付 2:支付宝)" ,required=true)
private Integer payType;
public Integer getPayType() {

19
yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/ProdCommParam.java
View File

@@ -12,48 +12,47 @@ package com.yami.shop.bean.app.param;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.yami.shop.common.serializer.json.ImgJsonSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import javax.validation.constraints.NotNull;
import java.util.List;
@Data
@ApiModel(value= "添加评论信息")
@Schema(description = "添加评论信息")
public class ProdCommParam {
/**
* 商品ID
*/
@ApiModelProperty(value = "商品id")
@Schema(description = "商品id" )
private Long prodId;
/**
* 订单项ID
*/
@ApiModelProperty(value = "订单项ID")
@Schema(description = "订单项ID" )
private Long orderItemId;
/**
* 评价，0-5分
*/
@ApiModelProperty(value = "评价，0-5分",required=true)
@Schema(description = "评价，0-5分" ,required=true)
@NotNull(message = "评价不能为空")
private Integer score;
@ApiModelProperty(value = "评论内容",required=true)
@Schema(description = "评论内容" ,required=true)
private String content;
@ApiModelProperty(value = "评论图片, 用逗号分隔")
@Schema(description = "评论图片, 用逗号分隔" )
private String pics;
/**
* 是否匿名(1:是 0:否)
*/
@ApiModelProperty(value = "是否匿名(1:是 0:否) 默认为否")
@Schema(description = "是否匿名(1:是 0:否) 默认为否" )
private Integer isAnonymous;
@ApiModelProperty(value = "* 评价(0好评 1中评 2差评)")
@Schema(description = "* 评价(0好评 1中评 2差评)" )
private Integer evaluate;
}

7
yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/SendSmsParam.java
View File

@@ -12,13 +12,12 @@ package com.yami.shop.bean.app.param;
import javax.validation.constraints.Pattern;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
@ApiModel(value= "发送验证码参数")
@Schema(description = "发送验证码参数")
public class SendSmsParam {
@ApiModelProperty(value = "手机号")
@Schema(description = "手机号" )
@Pattern(regexp="1[0-9]{10}",message = "请输入正确的手机号")
private String mobile;

9
yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/ShopCartParam.java
View File

@@ -10,17 +10,16 @@
package com.yami.shop.bean.app.param;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@ApiModel(value= "购物车参数")
@Schema(description = "购物车参数")
@Data
public class ShopCartParam {
@ApiModelProperty(value = "购物项id")
@Schema(description = "购物项id" )
private Long basketId;
@ApiModelProperty(value = "活动id,传0则不参与该活动")
@Schema(description = "活动id,传0则不参与该活动" )
private Long discountId;
}

7
yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/SubmitOrderParam.java
View File

@@ -12,13 +12,12 @@ package com.yami.shop.bean.app.param;
import java.util.List;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@Data
@ApiModel(value= "提交订单参数")
@Schema(description = "提交订单参数")
public class SubmitOrderParam {
@ApiModelProperty(value = "每个店铺提交的订单信息",required=true)
@Schema(description = "每个店铺提交的订单信息" ,required=true)
private List<OrderShopParam> orderShopParam;
}

9
yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/UserInfoParam.java
View File

@@ -10,18 +10,17 @@
package com.yami.shop.bean.app.param;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@Data
@ApiModel(value= "设置用户信息")
@Schema(description = "设置用户信息")
public class UserInfoParam {
@ApiModelProperty(value = "用户昵称")
@Schema(description = "用户昵称" )
private String nickName;
@ApiModelProperty(value = "用户头像")
@Schema(description = "用户头像" )
private String avatarUrl;
}

11
yami-shop-bean/src/main/java/com/yami/shop/bean/dto/HotSearchDto.java
View File

@@ -11,23 +11,22 @@
package com.yami.shop.bean.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
@ApiModel("热搜数据")
@Schema(description = "热搜数据")
@Data
public class HotSearchDto implements Serializable {
@ApiModelProperty("热搜id")
@Schema(description = "热搜id" )
private Long hotSearchId;
@ApiModelProperty("标题")
@Schema(description = "标题" )
private String title;
@ApiModelProperty("内容")
@Schema(description = "内容" )
private String content;
}

19
yami-shop-bean/src/main/java/com/yami/shop/bean/dto/SearchProdDto.java
View File

@@ -12,35 +12,34 @@ package com.yami.shop.bean.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.yami.shop.common.serializer.json.ImgJsonSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@Data
@ApiModel("搜索商品数据")
@Schema(description = "搜索商品数据")
public class SearchProdDto {
@ApiModelProperty(value = "商品id")
@Schema(description = "商品id" )
private Long prodId;
@ApiModelProperty(value = "商品照片")
@Schema(description = "商品照片" )
@JsonSerialize(using = ImgJsonSerializer.class)
private String pic;
@ApiModelProperty(value = "商品名字")
@Schema(description = "商品名字" )
private String prodName;
@ApiModelProperty(value = "商品价格")
@Schema(description = "商品价格" )
private Double price;
@ApiModelProperty(value = "商品评论数量")
@Schema(description = "商品评论数量" )
private Integer prodCommNumber;
@ApiModelProperty(value = "好评率")
@Schema(description = "好评率" )
private Double positiveRating;
@ApiModelProperty(value = "好评数量")
@Schema(description = "好评数量" )
private Integer praiseNumber;
}

10
yami-shop-bean/src/main/java/com/yami/shop/bean/model/Area.java
View File

@@ -15,7 +15,7 @@ import java.util.List;
import com.baomidou.mybatisplus.annotation.*;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@Data
@@ -23,16 +23,16 @@ import lombok.Data;
public class Area implements Serializable {
private static final long serialVersionUID = -6013320537436191451L;
@TableId
@ApiModelProperty(value = "地区id",required=true)
@Schema(description = "地区id" ,required=true)
private Long areaId;
@ApiModelProperty(value = "地区名称",required=true)
@Schema(description = "地区名称" ,required=true)
private String areaName;
@ApiModelProperty(value = "地区上级id",required=true)
@Schema(description = "地区上级id" ,required=true)
private Long parentId;
@ApiModelProperty(value = "地区层级",required=true)
@Schema(description = "地区层级" ,required=true)
private Integer level;
@TableField(exist=false)

16
yami-shop-bean/src/main/java/com/yami/shop/bean/model/Transfee.java
View File

@@ -15,7 +15,7 @@ import java.util.List;
import com.baomidou.mybatisplus.annotation.*;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@Data
@@ -26,46 +26,46 @@ public class Transfee implements Serializable {
* 运费项id
*/
@TableId
@ApiModelProperty(value = "运费项id",required=true)
@Schema(description = "运费项id" ,required=true)
private Long transfeeId;
/**
* 运费模板id
*/
@ApiModelProperty(value = "运费模板id",required=true)
@Schema(description = "运费模板id" ,required=true)
private Long transportId;
/**
* 续件数量
*/
@ApiModelProperty(value = "续件数量",required=true)
@Schema(description = "续件数量" ,required=true)
private Double continuousPiece;
/**
* 首件数量
*/
@ApiModelProperty(value = "首件数量",required=true)
@Schema(description = "首件数量" ,required=true)
private Double firstPiece;
/**
* 续件费用
*/
@ApiModelProperty(value = "续件费用",required=true)
@Schema(description = "续件费用" ,required=true)
private Double continuousFee;
/**
* 首件费用
*/
@ApiModelProperty(value = "首件费用",required=true)
@Schema(description = "首件费用" ,required=true)
private Double firstFee;
@TableField(exist=false)
@ApiModelProperty(value = "指定条件运费城市项",required=true)
@Schema(description = "指定条件运费城市项" ,required=true)
private List<Area> cityList;
}

14
yami-shop-bean/src/main/java/com/yami/shop/bean/model/TransfeeFree.java
View File

@@ -16,7 +16,7 @@ import java.util.List;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@Data
@@ -27,39 +27,39 @@ public class TransfeeFree implements Serializable {
* 指定条件包邮项id
*/
@TableId
@ApiModelProperty(value = "指定条件包邮项id",required=true)
@Schema(description = "指定条件包邮项id" ,required=true)
private Long transfeeFreeId;
/**
* 运费模板id
*/
@ApiModelProperty(value = "运费模板id",required=true)
@Schema(description = "运费模板id" ,required=true)
private Long transportId;
/**
* 包邮方式 （0 满x件/重量/体积包邮 1满金额包邮 2满x件/重量/体积且满金额包邮）
*/
@ApiModelProperty(value = "包邮方式 （0 满x件/重量/体积包邮 1满金额包邮 2满x件/重量/体积且满金额包邮）",required=true)
@Schema(description = "包邮方式 （0 满x件/重量/体积包邮 1满金额包邮 2满x件/重量/体积且满金额包邮）" ,required=true)
private Integer freeType;
/**
* 需满金额
*/
@ApiModelProperty(value = "需满金额",required=true)
@Schema(description = "需满金额" ,required=true)
private Double amount;
/**
* 包邮x件/重量/体积
*/
@ApiModelProperty(value = "包邮x件/重量/体积",required=true)
@Schema(description = "包邮x件/重量/体积" ,required=true)
private Double piece;
/**
* 指定条件包邮城市项
*/
@TableField(exist=false)
@ApiModelProperty(value = "指定条件包邮城市项",required=true)
@Schema(description = "指定条件包邮城市项" ,required=true)
private List<Area> freeCityList;
}

20
yami-shop-bean/src/main/java/com/yami/shop/bean/model/Transport.java
View File

@@ -21,7 +21,7 @@ import org.springframework.format.annotation.DateTimeFormat;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
@Data
@TableName("tz_transport")
@@ -31,14 +31,14 @@ public class Transport implements Serializable {
* 运费模板id
*/
@TableId
@ApiModelProperty(value = "运费模板id",required=true)
@Schema(description = "运费模板id" ,required=true)
private Long transportId;
/**
* 运费模板名称
*/
@ApiModelProperty(value = "运费模板名称",required=true)
@Schema(description = "运费模板名称" ,required=true)
private String transName;
/**
@@ -46,48 +46,48 @@ public class Transport implements Serializable {
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建时间",required=true)
@Schema(description = "创建时间" ,required=true)
private Date createTime;
/**
* 店铺id
*/
@ApiModelProperty(value = "店铺id",required=true)
@Schema(description = "店铺id" ,required=true)
private Long shopId;
/**
* 参考 TransportChargeType
* 收费方式（0 按件数,1 按重量 2 按体积）
*/
@ApiModelProperty(value = "收费方式（0 按件数,1 按重量 2 按体积）",required=true)
@Schema(description = "收费方式（0 按件数,1 按重量 2 按体积）" ,required=true)
private Integer chargeType;
/**
* 是否包邮 0:不包邮 1:包邮
*/
@ApiModelProperty(value = "是否包邮 0:不包邮 1:包邮",required=true)
@Schema(description = "是否包邮 0:不包邮 1:包邮" ,required=true)
private Integer isFreeFee;
/**
* 是否含有包邮条件
*/
@ApiModelProperty(value = "是否含有包邮条件",required=true)
@Schema(description = "是否含有包邮条件" ,required=true)
private Integer hasFreeCondition;
/**
* 指定条件包邮项
*/
@TableField(exist=false)
@ApiModelProperty(value = "指定条件包邮项",required=true)
@Schema(description = "指定条件包邮项" ,required=true)
private List<TransfeeFree> transfeeFrees;
/**
* 运费项
*/
@TableField(exist=false)
@ApiModelProperty(value = "运费项",required=true)
@Schema(description = "运费项" ,required=true)
private List<Transfee> transfees;
}

8
yami-shop-bean/src/main/java/com/yami/shop/bean/param/DeliveryOrderParam.java
View File

@@ -12,20 +12,20 @@ package com.yami.shop.bean.param;
import javax.validation.constraints.NotBlank;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
public class DeliveryOrderParam {
@NotBlank(message="订单号不能为空")
@ApiModelProperty(value = "订单号",required=true)
@Schema(description = "订单号" ,required=true)
private String orderNumber;
@NotBlank(message="快递公司id不能为空")
@ApiModelProperty(value = "快递公司",required=true)
@Schema(description = "快递公司" ,required=true)
private Long dvyId;
@NotBlank(message="物流单号不能为空")
@ApiModelProperty(value = "物流单号",required=true)
@Schema(description = "物流单号" ,required=true)
private String dvyFlowId;

23
yami-shop-bean/src/main/java/com/yami/shop/bean/param/UserRegisterParam.java
View File

@@ -10,41 +10,40 @@
package com.yami.shop.bean.param;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
/**
* @author lh
*/
@Data
@ApiModel(value= "设置用户信息")
@Schema(description = "设置用户信息")
public class UserRegisterParam {
@ApiModelProperty(value = "密码")
@Schema(description = "密码" )
private String passWord;
@ApiModelProperty(value = "邮箱")
@Schema(description = "邮箱" )
private String userMail;
@ApiModelProperty(value = "昵称")
@Schema(description = "昵称" )
private String nickName;
@ApiModelProperty(value = "用户名")
@Schema(description = "用户名" )
private String userName;
@ApiModelProperty(value = "手机号")
@Schema(description = "手机号" )
private String mobile;
@ApiModelProperty(value = "头像")
@Schema(description = "头像" )
private String img;
@ApiModelProperty(value = "校验登陆注册验证码成功的标识")
@Schema(description = "校验登陆注册验证码成功的标识" )
private String checkRegisterSmsFlag;
@ApiModelProperty(value = "当账户未绑定时，临时的uid")
@Schema(description = "当账户未绑定时，临时的uid" )
private String tempUid;
@ApiModelProperty(value = "用户id")
@Schema(description = "用户id" )
private Long userId;
}