From d621324bcf6c5a26f058b24e0f4d2930f41840f4 Mon Sep 17 00:00:00 2001 From: rx <auster_i@163.com> Date: 星期一, 05 八月 2024 18:45:50 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master-base' into master-prod-new --- phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) 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 a9f3bc8..e8db8bc 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 @@ -377,4 +377,25 @@ @PostMapping(value = "/user/statement/details") Result statementDetails(@RequestBody UserDto userDto); + + /** + * 鏌ヨ鐢ㄦ埛鏈�鏂扮殑鍚堝苟璐﹀彿璁板綍 + * */ + @PostMapping(value = "/user/merge/log") + Result userMergeLog(@RequestBody UserDto userDto); + + + /** + * 鏌ヨ鐢ㄦ埛VIP璁板綍浠ュ強瑕侀鍙栫殑浼樻儬鍒�,浼爑serId瀛楁 + * 杩斿洖瀹炰綋杞崲 UserCouponDataVo + * */ + @PostMapping(value = "/user/vip/log/coupon") + Result userVipLogCoupon(@RequestBody UserDto userDto); + + /** + * 鏌ヨ鐢ㄦ埛璐拱杩囩殑椤圭洰 + * */ + @PostMapping(value = "/user/buy/sku/logList") + Result getUserBuySkuList(@RequestBody UserDto userDto); + } \ No newline at end of file -- Gitblit v1.8.0