From 06f0fb09a61e16df895dc9feebea8ddd24d14db5 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 20 Apr 2021 13:44:36 +0800
Subject: [PATCH] 修复微商城订单bug
---
zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopOrder.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 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 f82f46d..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;
@@ -126,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;
@@ -225,7 +238,7 @@
/**
* 配送方式（1=物流，2=门店自取）
*/
- private String shippingMethod;
+ private Integer shippingMethod;
/**
* 配送门店ID
@@ -467,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;
}
--
Gitblit v1.9.1