From e4de90990c948898db5d0c2fc080853a144728c3 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期三, 13 四月 2022 09:38:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/lyq_battery_shop' into lyq_battery_shop
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComBatteryCommodityOrder.java | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComBatteryCommodityOrder.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComBatteryCommodityOrder.java
index 3e4fcba..37fcc38 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComBatteryCommodityOrder.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComBatteryCommodityOrder.java
@@ -173,6 +173,11 @@
* 收货地区编码
*/
private String receivingRegionCode;
+
+ /**
+ * 拼团id
+ */
+ private Long teamId;
/**
* 是否删除枚举（1.是 2.否）
*/
@@ -208,5 +213,32 @@
public interface PayType{
int WX = 1;
}
+
+ /**
+ * 活动状态（1.拼团活动 2.砍价活动 3.限时秒杀）
+ */
+ public interface ActivityType{
+ int PT = 1;
+ int KJ = 2;
+ int MS = 3;
+ }
+
+ /**
+ * 拼团状态（1.拼团中 2.拼团成功 3.拼团失败）
+ */
+ public interface CollageStatus{
+ int PTZ = 1;
+ int PTCG = 2;
+ int PTSB = 3;
+ }
+
+ /**
+ * 砍价状态（1.砍价中 2.砍价成功 3.砍价失败）
+ */
+ public interface BargainStatus{
+ int KJZ = 1;
+ int KJCG = 2;
+ int KJSB = 3;
+ }
}
--
Gitblit v1.7.1