From 7e507b2c234454eab68102613c1c128d58d11bed Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期五, 02 九月 2022 09:45:28 +0800
Subject: [PATCH] Merge branch 'master' of http://1.15.4.62/r/~chenjiahe/phis-service-feign
---
phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java | 9 +++++++++
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java | 2 ++
phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java | 2 ++
phis-feign/src/main/java/com/hz/his/dto/user/coupon/UserCouponDto.java | 2 ++
4 files changed, 15 insertions(+), 0 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 261dc7e..a2c339b 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
@@ -27,4 +27,6 @@
public static String TYPE_COMMON_GROUP_ACTIVITY = "group_activity";
/**鍏叡鏍囪瘑绫诲瀷,鑰佸甫鏂�*/
public static String TYPE_COMMON_OLD_NEW = "old_new";
+ /**鍏叡鏍囪瘑绫诲瀷,鍥㈣喘娲诲姩*/
+ public static String TYPE_COMMON_GIFT = "gift";
}
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 31d9e5c..ba96616 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
@@ -55,6 +55,8 @@
private String orderNo;
/**鐢ㄦ埛浼樻儬鍒告爣璇�*/
private String userCouponId;
+ /**骞冲彴绫诲瀷*/
+ private String platform;
/**棰嗗彇绫诲瀷-鏈煡*/
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 7c8fe90..f500d29 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
@@ -246,4 +246,13 @@
@PostMapping(value = "/user/sms-find")
Result userSms(@RequestBody UserDto userDto);
+ /**
+ * 鑾峰彇鐢ㄦ埛淇℃伅锛屽鍏ヤ汉缇ゅ寘涓撶敤
+ * 鏍规嵁CIQ鎴栬�呭悕绉板叏鍖归厤鏌ユ壘鐢ㄦ埛
+ * @param userDto 鍙娇鐢╪ame鍜孋IQ
+ * @return 杞寲浣跨敤UserDt
+ */
+ @PostMapping(value = "/user/crowd/import")
+ Result userCrowdImport(@RequestBody UserDto userDto);
+
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java b/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java
index 757737e..906cd91 100644
--- a/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java
+++ b/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java
@@ -67,4 +67,6 @@
private String wechat;
/**閭*/
private String email;
+ /**澶村儚*/
+ private String imgUrl;
}
--
Gitblit v1.8.0