From d85af61932a03bd03663daf9da33177af5824a5c Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 20 Apr 2021 14:09:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger
---
zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopOrder.java | 48 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 44 insertions(+), 4 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopOrder.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopOrder.java
index e3003fe..e19d5f5 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopOrder.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopOrder.java
@@ -3,6 +3,7 @@
import com.matrix.core.pojo.EntityDTO;
import com.matrix.core.anotations.Extend;
import com.matrix.core.tools.DateUtil;
+import io.swagger.models.auth.In;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
@@ -17,9 +18,22 @@
public class ShopOrder extends EntityDTO {
/**
+ * 支付方式-微信支付
+ */
+ public static final int SHOP_ORDER_PAY_METHOD_WX = 1;
+
+ /**
+ * 支付方式-vip会籍卡
+ */
+ public static final int SHOP_ORDER_PAY_METHOD_VIPCARD = 2;
+
+
+
+ /**
* 订单微信支付状态(待支付)
*/
public static final int ORDER_WX_STATUS_WAIT_PAY = 1;
+
/**
* 订单微信支付状态(支付成功)
*/
@@ -113,6 +127,18 @@
public static final int ACTIVITY_TYPE_SECKILL = 3;
/**
+ * 物流配送
+ */
+ public static final int SHIPPING_METHOD_WL = 1;
+
+ /**
+ * 门店自提
+ */
+ public static final int SHIPPING_METHOD_MDZT = 2;
+
+
+
+ /**
* 主键
*/
private Integer id;
@@ -162,7 +188,10 @@
* 支付状态(1=待支付，2=支付成功，3=支付失败)
*/
private Integer payStatus;
-
+ /**
+ * 支付方式1微信，2 vipCard余额
+ */
+ private Integer payMethod;
/**
* 优惠说明
@@ -209,7 +238,7 @@
/**
* 配送方式（1=物流，2=门店自取）
*/
- private String shippingMethod;
+ private Integer shippingMethod;
/**
* 配送门店ID
@@ -451,11 +480,11 @@
this.remarks = remarks;
}
- public String getShippingMethod() {
+ public Integer getShippingMethod() {
return shippingMethod;
}
- public void setShippingMethod(String shippingMethod) {
+ public void setShippingMethod(Integer shippingMethod) {
this.shippingMethod = shippingMethod;
}
@@ -491,10 +520,21 @@
this.delFlag = delFlag;
}
+
+ public Integer getPayMethod() {
+ return payMethod;
+ }
+
+ public void setPayMethod(Integer payMethod) {
+ this.payMethod = payMethod;
+ }
+
public String getWxOrderNo() {
return wxOrderNo;
}
+
+
public void setWxOrderNo(String wxOrderNo) {
this.wxOrderNo = wxOrderNo;
}
--
Gitblit v1.9.1