From bc4420f7a0ba1d243abcbea44b2203e2f6c6bc11 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Thu, 17 Feb 2022 22:35:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/java/com/matrix/system/hive/vo/OrderFlowVo.java | 108 ++++--------------------------------------------------
1 files changed, 8 insertions(+), 100 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/vo/OrderFlowVo.java b/zq-erp/src/main/java/com/matrix/system/hive/vo/OrderFlowVo.java
index 78ce807..2a0c4f4 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/vo/OrderFlowVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/vo/OrderFlowVo.java
@@ -2,18 +2,18 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.matrix.core.tools.DateUtil;
-import com.matrix.system.app.vo.OrderDetailItemVo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
-import java.util.List;
/**
* @author jyy
* @date 2021-01-27
**/
+@Data
@ApiModel(value = "OrderFlowVo", description = "订单流水返回参数类")
public class OrderFlowVo {
@@ -26,10 +26,10 @@
@ApiModelProperty(value = "订单号")
private String orderNo;
- @ApiModelProperty(value ="交易类型")
+ @ApiModelProperty(value = "交易类型")
private String flowType;
- @ApiModelProperty(value ="支付方式")
+ @ApiModelProperty(value = "支付方式")
private String payMethod;
@ApiModelProperty(value = "会员姓名")
@@ -50,103 +50,11 @@
@ApiModelProperty(value = "门店名称")
private String shopName;
+ @ApiModelProperty(value = "支付卡名称")
+ private String cardName;
+
@JsonFormat(pattern = DateUtil.DATE_FORMAT_SS, timezone = "GMT+8")
@ApiModelProperty(value = "创建时间")
private Date createTime;
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public String getOrderId() {
- return orderId;
- }
-
- public void setOrderId(String orderId) {
- this.orderId = orderId;
- }
-
- public String getOrderNo() {
- return orderNo;
- }
-
- public void setOrderNo(String orderNo) {
- this.orderNo = orderNo;
- }
-
- public String getFlowType() {
- return flowType;
- }
-
- public void setFlowType(String flowType) {
- this.flowType = flowType;
- }
-
- public String getPayMethod() {
- return payMethod;
- }
-
- public void setPayMethod(String payMethod) {
- this.payMethod = payMethod;
- }
-
- public String getVipName() {
- return vipName;
- }
-
- public void setVipName(String vipName) {
- this.vipName = vipName;
- }
-
- public String getFlowContent() {
- return flowContent;
- }
-
- public void setFlowContent(String flowContent) {
- this.flowContent = flowContent;
- }
-
- public BigDecimal getAmount() {
- return amount;
- }
-
- public void setAmount(BigDecimal amount) {
- this.amount = amount;
- }
-
- public String getStaffName() {
- return staffName;
- }
-
- public void setStaffName(String staffName) {
- this.staffName = staffName;
- }
-
- public String getFlowNo() {
- return flowNo;
- }
-
- public void setFlowNo(String flowNo) {
- this.flowNo = flowNo;
- }
-
- public String getShopName() {
- return shopName;
- }
-
- public void setShopName(String shopName) {
- this.shopName = shopName;
- }
-
- public Date getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
}
+
--
Gitblit v1.9.1