From 30e49b0e5164d16a65337201a449e5034166e298 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 22 三月 2023 17:35:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new-合并账号' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/user/UserMergeDto.java | 30 ++++++++++++++++++++++++++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java | 7 +++++++
2 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/UserMergeDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/UserMergeDto.java
new file mode 100644
index 0000000..623c24d
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/UserMergeDto.java
@@ -0,0 +1,30 @@
+package com.hz.his.dto.user;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 璐﹀彿鍚堝苟鏃ュ織-瀹炰綋
+ */
+@Data
+public class UserMergeDto {
+ /**淇濈暀鐨勭敤鎴锋爣璇�*/
+ private String persistUserId;
+ /**浣滃簾鐨勭敤鎴锋爣璇�*/
+ private String repealUserId;
+ /**鍚堝苟妯″潡 UserMerge鐨則ype*/
+ private List<Integer> mergeList;
+ /**鎿嶄綔鏉ユ簮娓犻亾(鍙傝�僷his-parent OriginChannelConstants)*/
+ private String originChannel;
+ /**鎿嶄綔浜虹被鍨�:0绯荤粺,1鍚庡彴璐﹀彿,2鐢ㄦ埛,3鍛樺伐*/
+ private Integer operatorType;
+ /**鎿嶄綔浜烘爣璇�*/
+ private String operatorId;
+ /**鎿嶄綔浜哄悕绉�*/
+ private String operatorName;
+ /**鎿嶄綔鏃堕棿-yyyy-MM-dd HH:mm:ss*/
+ private String opTime;
+ /**鎿嶄綔澶囨敞*/
+ private String opRemarks;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
index 2336000..84c0945 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
@@ -2,6 +2,7 @@
import com.hx.resultTool.Result;
import com.hz.his.dto.user.UserListDto;
+import com.hz.his.dto.user.UserMergeDto;
import com.hz.his.dto.user.UserParamDto;
import com.hz.his.dto.user.UserUnionDto;
import com.hz.his.dto.user.coupon.UserCouponDto;
@@ -74,4 +75,10 @@
*/
@PostMapping("user/level/progress")
Result userLevelProgress(@RequestBody JSONObject parmData);
+
+ /**
+ * 鐢ㄦ埛鍗囩骇杩涘害
+ */
+ @PostMapping("/user/merge/log/add")
+ Result userMergeAdd(@RequestBody UserMergeDto userMergeDto);
}
\ No newline at end of file
--
Gitblit v1.8.0