From 1eedb8a57c2eb5c9953dcf058184ebdc6987fbf5 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 24 May 2022 15:14:21 +0800
Subject: [PATCH] Merge branch 'feature/订单服务单代码改造' into alpha
---
zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopProduct.java | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopProduct.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopProduct.java
index 5057ab4..73ef54d 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopProduct.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopProduct.java
@@ -13,15 +13,15 @@
*/
@Data
public class ShopProduct extends EntityDTOExt {
+ /**
+ * 可用积分
+ */
+ public static final int PAYFOR_SCORE =1;
+ /**
+ * 不用积分
+ */
+ public static final int NOT_PAYFOR_SCORE =2;
- /**
- * 卖场-微商城
- */
- public static final int MALL_MICRO =1;
- /**
- * 卖场-积分商城
- */
- public static final int MALL_SCORE=2;
/**
* 可分销
*/
@@ -80,9 +80,9 @@
private String imgMobile;
/**
- * 上架卖场 1 微商城，2 积分商城
+ * 是否可用积分支付 1是，2不是
*/
- private Integer mallType;
+ private Integer ableScorePay;
/**
@@ -272,6 +272,9 @@
private Long companyId;
-
+ /**
+ * 是否虚拟产品 1/是 2/否
+ */
+ private Integer isUnrealProduct;
}
\ No newline at end of file
--
Gitblit v1.9.1