From da53ee87482e45bad633c6391697c675030b4bcf Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期五, 04 八月 2023 11:05:12 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 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 a044af2..fdb98a9 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;
/**
@@ -12,19 +13,42 @@
*/
@Data
public class CouponDto extends PageDto {
+ /**鏉ユ簮缂栫爜,鍟嗘埛鑷畾涔夋湇鍔℃潵婧愭爣璇�*/
+ private String appIdCode;
/**鎿嶄綔浜烘爣璇�*/
private String operatorId;
/**鎿嶄綔浜哄悕绉�*/
private String operatorName;
+ /**鎿嶄綔浜虹被鍨�*/
+ private Integer operatorType;
+ /**鐢ㄦ埛鏍囪瘑*/
+ private String userId;
+ /**娲诲姩鏍囪瘑*/
+ private String groupBuyId;
+ private String id;
/**鍙戦�佽褰�*/
private CouponRecordDto couponReleaseRecordItem;
/**鐢ㄦ埛璇︽儏*/
private List<UserArrDto> userArr;
- /**鏉ユ簮缂栫爜,鍟嗘埛鑷畾涔夋湇鍔℃潵婧愭爣璇�*/
- private String appIdCode;
+ private List<CouponItemDto> itemDtoList;
/**淇敼鏃堕棿*/
private String updateTime;
+ /**浼樻儬鍒告爣璇�*/
+ private String couponId;
+ /**鍙戞斁浼樻儬鍒稿弬鏁�-璁㈠崟鏍囪瘑*/
+ private String orderId;
+ /*鐢ㄦ埛浼樻儬鍒�*/
+ private String couponNumberId;
+
+ //寮�鍗曠粨璐︿竴璧锋墽琛屾牎楠屼紭鎯犲埜鎺ュ彛浣跨敤鍙傛暟
+ /** 浼樻儬鍒稿晢鍝丣SON鏁扮粍瀛楃 */
+ private String couponGoodsArr;
+ /** 璁㈠崟搴斾粯閲戦 */
+ private BigDecimal shouldTotal;
+
+ /** 鏄惁鏄惀閿�鍔╂墜鐢宠 0=鍚� 1=鏄�*/
+ private Integer isMarketApply = 0;
}
--
Gitblit v1.8.0