From 599cb3a300878dc8b3a579f967fbad4a7eb536e7 Mon Sep 17 00:00:00 2001
From: Andru <769883346@qq.com>
Date: 星期五, 27 十月 2023 16:07:48 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java | 36 +++++++++++++++++++++---------------
1 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java
index 3dab28a..2e30c02 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java
@@ -1,9 +1,10 @@
package com.hz.his.dto.coupon;
-
-
import com.hz.his.dto.PageDto;
import lombok.Data;
+import org.dom4j.tree.BaseElement;
+
+import java.math.BigDecimal;
import java.util.List;
/**
@@ -20,9 +21,11 @@
private String operatorName;
/**鎿嶄綔浜虹被鍨�*/
private Integer operatorType;
+ /**鐢ㄦ埛鏍囪瘑*/
+ private String userId;
/**娲诲姩鏍囪瘑*/
private String groupBuyId;
- private String id;
+ private List<String> idList;
/**鍙戦�佽褰�*/
private CouponRecordDto couponReleaseRecordItem;
/**鐢ㄦ埛璇︽儏*/
@@ -40,17 +43,20 @@
/*鐢ㄦ埛浼樻儬鍒�*/
private String couponNumberId;
- //--------------------------------------------------------------------
- //瀵瑰簲phis琛–ouponReleaseRecord甯搁噺
- /**鎿嶄綔浜虹被鍨�-鍛樺伐*/
- public static Integer OPERATOR_TYPE_EMPLOYEES = 0;
- /**鎿嶄綔浜虹被鍨�-绠＄悊鍛�*/
- public static Integer OPERATOR_TYPE_ADMIN = 1;
- /**鎿嶄綔浜虹被鍨�-鐢ㄦ埛鑷*/
- public static Integer OPERATOR_TYPE_USER = 2;
- /**鎿嶄綔浜虹被鍨�-绯荤粺*/
- public static Integer OPERATOR_TYPE_SYSTEM = 3;
- /**鎿嶄綔浜虹被鍨�-鐢ㄦ埛璁㈠崟璐拱*/
- public static Integer OPERATOR_TYPE_USER_ORDER = 4;
+ //寮�鍗曠粨璐︿竴璧锋墽琛屾牎楠屼紭鎯犲埜鎺ュ彛浣跨敤鍙傛暟
+ /** 浼樻儬鍒稿晢鍝丣SON鏁扮粍瀛楃 */
+ private String couponGoodsArr;
+ /** 璁㈠崟搴斾粯閲戦 */
+ private BigDecimal shouldTotal;
+ /** 鏄惁鏄惀閿�鍔╂墜鐢宠 0=鍚� 1=鏄�*/
+ private Integer isMarketApply = 0;
+
+ /** 浼樻儬鍒稿垎绫籌D*/
+ private String couponTypeId;
+ /** 鍩虹鍒嗙被-浼樻儬鍒�*/
+ private String type;
+
+ /** 浼樻儬鍒窱D*/
+ private List<String> couponIdList;
}
--
Gitblit v1.8.0