From 5d542ef50426fdaf5c06d09f6a7c5d13529ea4ac Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期五, 14 六月 2024 17:07:33 +0800
Subject: [PATCH] Merge branch 'master-fwq-团购提前扣取金额' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java |   35 ++++++++++++++++++++++++++++++++---
 1 files changed, 32 insertions(+), 3 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 a751cd0..34eea27 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,6 +43,32 @@
     /*鐢ㄦ埛浼樻儬鍒�*/
     private String couponNumberId;
 
+    //寮�鍗曠粨璐︿竴璧锋墽琛屾牎楠屼紭鎯犲埜鎺ュ彛浣跨敤鍙傛暟
+    /** 浼樻儬鍒稿晢鍝丣SON鏁扮粍瀛楃 */
+    private String couponGoodsArr;
+    /** 璁㈠崟搴斾粯閲戦 */
+    private BigDecimal shouldTotal;
 
+    /** 鏄惁鏄惀閿�鍔╂墜鐢宠 0=鍚� 1=鏄�*/
+    private Integer isMarketApply = 0;
+    /**鏄惁鏌ヨ鍏宠仈淇℃伅*/
+    private Integer isSelectGoods = 1;
+    /**鏌ヨ鐢熸棩鍒�*/
+    private Integer isSelectBirthday;
+    /**浼樻儬鍒哥被鍨�*/
+    private String couponType;
+
+    /** 浼樻儬鍒稿垎绫籌D*/
+    private String couponTypeId;
+    /** 鍩虹鍒嗙被-浼樻儬鍒�*/
+    private String type;
+
+    /** 浼樻儬鍒窱D*/
+    private List<String> couponIdList;
+
+    /**骞冲彴闄愬埗*/
+    private Integer platLimit;
+    /**骞冲彴鍙敤杩囨护,appId*/
+    private List<String> limitPlatformList;
 
 }

--
Gitblit v1.8.0