From bfbfe7d5fd6c90d5f7359762223ce4bd1cc7cfa1 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 15 八月 2022 09:56:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/lyq_battery_shop' into diandongche
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityOrderVo.java | 231 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 231 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityOrderVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityOrderVo.java
new file mode 100644
index 0000000..c209ae4
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityOrderVo.java
@@ -0,0 +1,231 @@
+package com.panzhihua.common.model.vos.common;
+
+ import java.math.BigDecimal;
+ import java.util.Date;
+
+ import com.fasterxml.jackson.annotation.JsonFormat;
+ import org.springframework.format.annotation.DateTimeFormat;
+ import io.swagger.annotations.ApiModel;
+ import io.swagger.annotations.ApiModelProperty;
+ import lombok.Data;
+
+/**
+ * title: 电动车商城-订单表返回参数
+ * <p>
+ * projectName 成都呐喊信息技术有限公司-智慧社区项目
+ * <p>
+ * description: 电动车商城-订单表返回参数
+ *
+ * @author lyq
+ * @date 2022-03-29 13:18:46
+ */
+@Data
+@ApiModel("电动车商城-订单表返回参数")
+public class ComBatteryCommodityOrderVo {
+
+ /**
+ * 主键id
+ */
+ @ApiModelProperty(value = "主键id")
+ private Long id;
+ /**
+ * 用户id
+ */
+ @ApiModelProperty(value = "用户id")
+ private Long userId;
+ /**
+ * 商家id
+ */
+ @ApiModelProperty(value = "商家id")
+ private Long storeId;
+ /**
+ * 收货地址id
+ */
+ @ApiModelProperty(value = "收货地址id")
+ private Long addressId;
+ /**
+ * 活动id
+ */
+ @ApiModelProperty(value = "活动id")
+ private Long activityId;
+ /**
+ * 商品id
+ */
+ @ApiModelProperty(value = "商品id")
+ private Long commodityId;
+ /**
+ * 商品规格id
+ */
+ @ApiModelProperty(value = "商品规格id")
+ private Long specsId;
+ /**
+ * 订单号
+ */
+ @ApiModelProperty(value = "订单号")
+ private String orderNo;
+ /**
+ * 活动状态（1.拼团活动 2.砍价活动 3.限时秒杀）
+ */
+ @ApiModelProperty(value = "活动状态（1.拼团活动 2.砍价活动 3.限时秒杀）")
+ private Integer activityType;
+ /**
+ * 订单状态（1.待付款 2.待发货 3.待收货 4.已完成 5.待拼团 6.待砍价 7.已退款 8.已关闭）
+ */
+ @ApiModelProperty(value = "订单状态（1.待付款 2.待发货 3.待收货 4.已完成 5.待拼团 6.待砍价 7.已退款 8.已关闭）")
+ private Integer status;
+ /**
+ * 拼团状态（1.拼团中 2.拼团成功 3.拼团失败）
+ */
+ @ApiModelProperty(value = "拼团状态（1.拼团中 2.拼团成功 3.拼团失败）")
+ private Integer collageStatus;
+ /**
+ * 砍价状态（1.砍价中 2.砍价成功 3.砍价失败）
+ */
+ @ApiModelProperty(value = "砍价状态（1.砍价中 2.砍价成功 3.砍价失败）")
+ private Integer bargainStatus;
+ /**
+ * 支付状态(1.未支付 2.已支付)
+ */
+ @ApiModelProperty(value = "支付状态(1.未支付 2.已支付)")
+ private Integer payStatus;
+ /**
+ * 是否已删除（1.是 2.否）
+ */
+ @ApiModelProperty(value = "是否已删除（1.是 2.否）")
+ private Integer isDel;
+ /**
+ * 支付方式（1.微信支付）
+ */
+ @ApiModelProperty(value = "支付方式（1.微信支付）")
+ private Integer payType;
+ /**
+ * 购买商品数量
+ */
+ @ApiModelProperty(value = "购买商品数量")
+ private Integer count;
+ /**
+ * 商品单价
+ */
+ @ApiModelProperty(value = "商品单价")
+ private BigDecimal price;
+ /**
+ * 订单金额
+ */
+ @ApiModelProperty(value = "订单金额")
+ private BigDecimal amount;
+ /**
+ * 运费
+ */
+ @ApiModelProperty(value = "运费")
+ private BigDecimal freight;
+ /**
+ * 物流单号
+ */
+ @ApiModelProperty(value = "物流单号")
+ private String logisticsNo;
+ /**
+ * 物流公司
+ */
+ @ApiModelProperty(value = "物流公司")
+ private String logisticsCompany;
+ /**
+ * 订单最终金额
+ */
+ @ApiModelProperty(value = "订单最终金额")
+ private BigDecimal finalAmount;
+ /**
+ * 支付单号
+ */
+ @ApiModelProperty(value = "支付单号")
+ private String payNo;
+ /**
+ * 支付总金额
+ */
+ @ApiModelProperty(value = "支付总金额")
+ private BigDecimal payAmount;
+ /**
+ * 订单备注
+ */
+ @ApiModelProperty(value = "订单备注")
+ private String remark;
+ /**
+ * 发货时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "发货时间")
+ private Date deliveryTime;
+ /**
+ * 收货时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "收货时间")
+ private Date receivingTime;
+ /**
+ * 下单时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "下单时间")
+ private Date createAt;
+ /**
+ * 创建人id
+ */
+ @ApiModelProperty(value = "创建人id")
+ private Long createBy;
+ /**
+ * 修改时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty(value = "修改时间")
+ private Date updateAt;
+ /**
+ * 修改人id
+ */
+ @ApiModelProperty(value = "修改人id")
+ private Long updateBy;
+
+ @ApiModelProperty(value = "商品名称")
+ private String commodityName;
+
+ @ApiModelProperty(value = "商品规格名称")
+ private String specsName;
+
+ @ApiModelProperty(value = "商户名称")
+ private String storeName;
+
+ @ApiModelProperty(value = "用户账号")
+ private String phone;
+
+ @ApiModelProperty(value = "订单商品信息")
+ private ComBatteryCommodityVo commodityVo;
+
+ @ApiModelProperty(value = "订单商品规格信息")
+ private ComBatteryCommoditySpecsVo commoditySpecsVo;
+
+ @ApiModelProperty(value = "用户绑定收货地址")
+ private ComBatteryUserAddressVo userAddressVo;
+
+ @ApiModelProperty(value = "收件人")
+ private String receivingName;
+
+ @ApiModelProperty(value = "收件人联系方式")
+ private String receivingPhone;
+
+ @ApiModelProperty(value = "收货人地区")
+ private String receivingRegion;
+
+ @ApiModelProperty(value = "收货人详细地址")
+ private String receivingAddress;
+
+ @ApiModelProperty(value = "商品规格图片")
+ private String commodityImages;
+
+ @ApiModelProperty(value = "收货地区编码")
+ private String receivingRegionCode;
+
+ @ApiModelProperty(value = "用户昵称")
+ private String nickName;
+}
--
Gitblit v1.7.1