From ba3c255cbfc3fd6ff0708dca96c9e256c690e370 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 13 Apr 2021 13:28:36 +0800
Subject: [PATCH] 修改订单物流查询信息
---
zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopOrder.java | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 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..f82f46d 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
@@ -17,9 +17,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;
+
/**
* 订单微信支付状态(支付成功)
*/
@@ -162,7 +175,10 @@
* 支付状态(1=待支付，2=支付成功，3=支付失败)
*/
private Integer payStatus;
-
+ /**
+ * 支付方式1微信，2 vipCard余额
+ */
+ private Integer payMethod;
/**
* 优惠说明
@@ -491,10 +507,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