From 9c791d431038fe79a111805762ee2f42c96b51c5 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 08 Nov 2021 17:03:15 +0800
Subject: [PATCH] fix

---
 zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopOrder.java |   66 +++++++++++++++++++++++++++++----
 1 files changed, 58 insertions(+), 8 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 46da7f2..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;
@@ -140,8 +166,11 @@
     /**
      * 用户ID
      */
-    private String userId;
-
+    private Long userId;
+    /**
+     * 支付积分
+     */
+    private Integer scorePay;
 
     /**
      * 下单时间
@@ -159,7 +188,10 @@
      * 支付状态(1=待支付，2=支付成功，3=支付失败)
      */
     private Integer payStatus;
-
+    /**
+     *  支付方式1微信，2 vipCard余额
+     */
+    private Integer payMethod;
 
     /**
      * 优惠说明
@@ -206,7 +238,7 @@
     /**
      * 配送方式（1=物流，2=门店自取）
      */
-    private String shippingMethod;
+    private Integer shippingMethod;
 
     /**
      * 配送门店ID
@@ -336,6 +368,13 @@
         return orderNo;
     }
 
+    public Integer getScorePay() {
+        return scorePay;
+    }
+
+    public void setScorePay(Integer scorePay) {
+        this.scorePay = scorePay;
+    }
 
     public void setOrderNo(String orderNo) {
         this.orderNo = orderNo;
@@ -357,11 +396,11 @@
         this.commodityPrice = commodityPrice;
     }
 
-    public String getUserId() {
+    public Long getUserId() {
         return userId;
     }
 
-    public void setUserId(String userId) {
+    public void setUserId(Long userId) {
         this.userId = userId;
     }
 
@@ -441,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;
     }
 
@@ -481,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