From b845494ca97a02a2fe5a261b124b4ceb51a040f0 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期二, 08 八月 2023 15:22:02 +0800
Subject: [PATCH] Merge branch 'master-fwq抽奖配置' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java | 4 ++
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java | 2 +
phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java | 6 +--
phis-feign/src/main/java/com/hz/phis/dt/user/UserDrawDt.java | 49 ++++++++++++++++++++++++
4 files changed, 57 insertions(+), 4 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 82af4b1..edd4d5c 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
@@ -39,4 +39,6 @@
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";
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
index 3768939..00da1d8 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
@@ -1,7 +1,5 @@
package com.hz.his.dto.user;
-import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
-import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
import com.hz.his.dto.PageDto;
import lombok.Data;
@@ -39,9 +37,9 @@
private Integer isHaveShop;
/**鏄惁鏈夐【闂�*/
private Integer isHaveCorp;
-
+ /**寮�濮嬫椂闂�*/
private Date startTime;
-
+ /**缁撴潫鏃堕棿*/
private Date endTime;
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
index 6309cc7..77ac4ed 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
@@ -340,4 +340,8 @@
* */
@PostMapping(value = "/user/query/oldNewPerformance")
Result queryOldNewPerformance(@RequestBody UserDto userDto);
+
+
+ @PostMapping(value = "/user/draw/list")
+ Result drawGetUserDt(@RequestBody UserDto userDto);
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/user/UserDrawDt.java b/phis-feign/src/main/java/com/hz/phis/dt/user/UserDrawDt.java
new file mode 100644
index 0000000..37a7442
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/user/UserDrawDt.java
@@ -0,0 +1,49 @@
+package com.hz.phis.dt.user;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**鎶藉-鐢ㄦ埛璇︽儏鏁版嵁杩斿洖瀹炰綋*/
+@Data
+public class UserDrawDt {
+ /**鏄惁鍛樺伐:0鍚�1鏄�*/
+ private Integer isEmployee;
+ /**鏍囪瘑*/
+ private String id;
+ private String crmId;
+ /**ciq浼氬憳鍙�*/
+ private String ciq;
+ /**鍚嶇О*/
+ private String name;
+ /**鎵嬫満鍙�*/
+ private String tel;
+ /**鐢熸棩yyyy-MM-dd*/
+ private String birthDay;
+ /**娉ㄥ唽鏃堕棿*/
+ private Date regTime;
+ /**鐢ㄦ埛浼氬憳鍚嶇О*/
+ private String userLevel;
+ /**鐢ㄦ埛浼氬憳绛夌骇缂栫爜*/
+ private String hisNo;
+ /**鐢ㄦ埛浼氬憳绛夌骇id*/
+ private String memberLevelId;
+ /**鐢ㄦ埛浼氬憳绛夌骇鍚嶇О*/
+ private String memberName;
+
+ /**鏉ユ簮id,椤剁骇*/
+ private String channelId;
+ /**鏉ユ簮,椤剁骇*/
+ private String channelType;
+ /**浜岀骇鏉ユ簮id,鏈骇*/
+ private String channel2Id;
+ /**浜岀骇鏉ユ簮,鏈骇*/
+ private String channelType2;
+ /**鎵�灞為棬搴�*/
+ private String shopId;
+ /**鎵�灞為棬搴楀悕绉�*/
+ private String shopName;
+ /**鎬у埆*/
+ private Integer gender;
+
+}
--
Gitblit v1.8.0