From b53a5f6d5892c658f20968e396ce0661ba403ee7 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 28 二月 2024 18:22:08 +0800
Subject: [PATCH] Merge branch 'master-fwq-金额规则配置' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java
index 261dc7e..2234f92 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java
@@ -16,6 +16,8 @@
private String recordName;
/**鍏叡鏍囪瘑*/
private String commonId;
+ /**鍏叡瀛愭爣璇�*/
+ private String commonItemId;
/**鍏叡绫诲瀷*/
private String commonType;
@@ -27,4 +29,20 @@
public static String TYPE_COMMON_GROUP_ACTIVITY = "group_activity";
/**鍏叡鏍囪瘑绫诲瀷,鑰佸甫鏂�*/
public static String TYPE_COMMON_OLD_NEW = "old_new";
+ /**鍏叡鏍囪瘑绫诲瀷,绀煎搧鍗�*/
+ public static String TYPE_COMMON_GIFT = "gift";
+ /**鍏叡鏍囪瘑绫诲瀷,钀ラ攢浼樻儬鍒�*/
+ public static String TYPE_COMMON_MARKE = "marketing";
+ /**鍏叡鏍囪瘑绫诲瀷,涓夊叓濡囧コ鑺傞鍙栦紭鎯犲埜*/
+ public static final String TYPE_COMMON_QUEEN_DAY = "queen_day";
+ /**鍏叡鏍囪瘑绫诲瀷,crm鍟嗗搧璇︽儏棰嗗彇浼樻儬鍒�*/
+ public static final String TYPE_COMMON_GOODS_DETAILS = "goods_details";
+ /**鍏叡鏍囪瘑绫诲瀷,璁㈠崟璐拱浼樻儬鍒�*/
+ public static final String TYPE_COMMON_ORDER = "order";
+ /**鍏叡鏍囪瘑绫诲瀷,鎶藉娲诲姩*/
+ public static final String TYPE_COMMON_DRAW = "draw";
+ /**鍏叡鏍囪瘑绫诲瀷,ken娲诲姩棰嗗彇 */
+ public static String TYPE_COMMON_ACTIVITY_KEN = "activity_ken";
+ /**鍏叡鏍囪瘑绫诲瀷,ken娲诲姩棰嗗彇 */
+ public static String TYPE_COMMON_BURST_ACTIVITY = "burst_activity";
}
--
Gitblit v1.8.0