From 9622984febad355276cfc0614cfa45be454434e3 Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期三, 24 五月 2023 11:15:06 +0800
Subject: [PATCH] 添加时间段查询

---
 phis-feign/src/main/java/com/hz/his/dto/user/coupon/UserCouponDto.java |   92 +++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 82 insertions(+), 10 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/coupon/UserCouponDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/coupon/UserCouponDto.java
index e32c806..3ca5adc 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/coupon/UserCouponDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/coupon/UserCouponDto.java
@@ -5,27 +5,99 @@
 import lombok.Data;
 
 /**
+ * 鐢ㄦ埛浼樻儬鍒�
  * @author fwq
- * 鐢ㄦ埛浼樻儬鍒告墿灞�
- * */
+ */
 @Data
 public class UserCouponDto extends PageDto {
+    /*****************************鍙栨秷浣跨敤*************************/
+    /**绫诲瀷0璁㈠崟1鍏呭��*/
+    private Integer type;
+    /**瀛愯鍗曞彿*/
+    private String orderItemNo;
+
+    /*****************************鏂板浣跨敤******************************/
+    /**phis浼樻儬鍒告爣璇�*/
+    private String couponId;
+    /**鏁伴噺*/
+    private Integer couponNum;
+    /**棰嗗彇绫诲瀷*/
+    private Integer collectionType;
     /**phis鐢ㄦ埛鏍囪瘑*/
     private String userId;
+    /**鎵嬫満鍙�*/
+    private String tel;
+    /**鎿嶄綔浜烘爣璇�*/
+    private String operatorId;
+    /**鎿嶄綔浜哄悕绉�*/
+    private String operatorName;
+    /**鎿嶄綔浜虹被鍨�*/
+    private Integer operatorType;
+    /**绠$悊鍛業d*/
+    private String adminId;
+    /**绠$悊鍛樺悕*/
+    private String adminName;
+    /**澶囨敞淇℃伅*/
+    private String remarks;
+    /**鏄惁鐭俊閫氱煡瀹㈡埛*/
+    private Integer isSmsSend;
+    /**鏍囧織鏍囪瘑绫诲瀷:crm,璁㈠崟order,recharge鍏呭��*/
+    private String commonType;
+    /**鏍囧織鏍囪瘑锛堢ぜ鍖呰褰曟爣璇嗘垨鑰呭叾浠栨爣璇嗭級*/
+    private String commonId;
+    /**鏍囧織瀛愭爣璇�*/
+    private String commonItemId;
     /**鏈夋晥鐘舵�侊細0浣滃簾1鏈夋晥*/
     private Integer validState;
     /**鏄惁浣跨敤*/
     private Integer isUse;
-    /**鏍囧織鏍囪瘑绫诲瀷:crm,璁㈠崟order,recharge鍏呭��*/
-    private String commonType;
-    /**鏍囧織鏍囪瘑*/
-    private String commonId;
-    /**鏍囧織瀛愭爣璇�*/
-    private String commonItemId;
     /**璁㈠崟鍙�*/
     private String orderNo;
-    /**瀛愯鍗曞彿*/
-    private String orderItemNo;
     /**鐢ㄦ埛浼樻儬鍒告爣璇�*/
     private String userCouponId;
+    /**骞冲彴绫诲瀷*/
+    private String platform;
+    /**鍒楄〃鐘舵��:0鍏ㄩ儴1鏈娇鐢�2宸蹭娇鐢�3宸茶繃鏈�*/
+    private Integer listStatus;
+
+
+    /**棰嗗彇绫诲瀷-鏈煡*/
+    public static Integer C_TYPE_UNKNOW = -1;
+    /**棰嗗彇绫诲瀷-鐢ㄦ埛鑷*/
+    public static Integer C_TYPE_USER = 0;
+    /**棰嗗彇绫诲瀷-绠$悊鍛樿禒閫�*/
+    public static Integer C_TYPE_ADMIN = 1;
+    /**棰嗗彇绫诲瀷-鍛樺伐璧犻��*/
+    public static Integer C_TYPE_STAFF = 2;
+    /**棰嗗彇绫诲瀷-鍗忓晢璧犻��*/
+    public static Integer C_TYPE_NEGOTIATION = 3;
+    /**棰嗗彇绫诲瀷-鎹㈣揣*/
+    public static Integer C_TYPE_CHANGE = 4;
+    /**棰嗗彇绫诲瀷-鍏呭�肩疮璁¤禒閫�*/
+    public static Integer C_TYPE_RECHARGE_SEND = 5;
+
+    /**浣跨敤绫诲瀷-鏈煡*/
+    public static Integer USE_TYPE_UNKNOW = -1;
+    /**浣跨敤绫诲瀷-鐢ㄦ埛浣跨敤*/
+    public static Integer USE_TYPE_USER = 0;
+    /**浣跨敤绫诲瀷-绠$悊鍛樻牳閿�*/
+    public static Integer USE_TYPE_ADMIN = 1;
+
+    /**鏍囧織鏍囪瘑-璁㈠崟*/
+    public static String COMMON_TYPE_ORDER = "order";
+    /**鏍囧織鏍囪瘑-鍏呭��*/
+    public static String COMMON_TYPE_RECHARGE = "recharge";
+
+
+    /**鍙戦�佺煭淇$姸鎬�-鎴愬姛*/
+    public static Integer NOTE_STARUS_SUCCEED = 1;
+    /**鍙戦�佺煭淇$姸鎬�-澶辫触*/
+    public static Integer NOTE_STARUS_FALL = 0;
+
+    /**鎿嶄綔浜虹被鍨�-绠$悊鍛�*/
+    public static Integer OPERATOR_TYPE_ADMIN = 1;
+    /**鎿嶄綔浜虹被鍨�-鍛樺伐*/
+    public static Integer OPERATOR_TYPE_EMPLOYEES = 0;
+    /**鎿嶄綔浜虹被鍨�-鐢ㄦ埛鑷*/
+    public static Integer OPERATOR_TYPE_USER = 2;
 }

--
Gitblit v1.8.0