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/ComBatteryCommodityOrderBargainVo.java |  107 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 107 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityOrderBargainVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityOrderBargainVo.java
new file mode 100644
index 0000000..9f23b47
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/ComBatteryCommodityOrderBargainVo.java
@@ -0,0 +1,107 @@
+package com.panzhihua.common.model.vos.common;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+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 16:06:37
+ */
+@Data
+@ApiModel("电动车商城-砍价订单记录表返回参数")
+public class ComBatteryCommodityOrderBargainVo {
+
+    /**
+     * 主键id
+     */
+    @ApiModelProperty(value = "主键id")
+    private Long id;
+    /**
+     * 用户id
+     */
+    @ApiModelProperty(value = "用户id")
+    private Long userId;
+    /**
+     * 商品id
+     */
+    @ApiModelProperty(value = "商品id")
+    private Long commodityId;
+    /**
+     * 活动id
+     */
+    @ApiModelProperty(value = "活动id")
+    private Long activityId;
+    /**
+     * 订单id
+     */
+    @ApiModelProperty(value = "订单id")
+    private Long orderId;
+    /**
+     * 订单号
+     */
+    @ApiModelProperty(value = "订单号")
+    private String orderNo;
+    /**
+     * 商品原价
+     */
+    @ApiModelProperty(value = "商品原价")
+    private BigDecimal originalPrice;
+    /**
+     * 目标价格
+     */
+    @ApiModelProperty(value = "目标价格")
+    private BigDecimal targetPrice;
+    /**
+     * 当前价格
+     */
+    @ApiModelProperty(value = "当前价格")
+    private BigDecimal currentPrice;
+    /**
+     * 当前已砍价次数
+     */
+    @ApiModelProperty(value = "当前已砍价次数")
+    private Integer count;
+    /**
+     * 创建时间
+     */
+    @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;
+
+    @ApiModelProperty(value = "好友帮砍价记录列表")
+    private List<ComBatteryCommodityOrderBargainRecordVo> orderBargainRecordList;
+
+    @ApiModelProperty(value = "用户昵称")
+    private String nickName;
+
+    @ApiModelProperty(value = "用户头像")
+    private String imageUrl;
+
+    @ApiModelProperty(value = "商品名称")
+    private String commodityName;
+
+    @ApiModelProperty(value = "商品图片")
+    private String commodityImages;
+
+    @ApiModelProperty(value = "砍价状态(1.砍价中 2.砍价成功 3.砍价失败)")
+    private Integer bargainStatus;
+}

--
Gitblit v1.7.1