From d6c8f09fd628bd0111de4ee7071844465df9adb1 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期一, 28 十月 2024 18:57:35 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile --- ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java | 39 +++++++++++++++++++++++++++++++++++++-- 1 files changed, 37 insertions(+), 2 deletions(-) diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java index 20c7d65..1646c54 100644 --- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java +++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java @@ -1,7 +1,9 @@ package com.ruoyi.account.api.feignClient; +import com.ruoyi.account.api.dto.GiveVipDto; import com.ruoyi.account.api.model.TAppCoupon; import com.ruoyi.account.api.model.TAppUser; +import com.ruoyi.account.api.model.TAppUserAddress; import com.ruoyi.common.core.constant.ServiceNameConstants; import com.ruoyi.account.api.factory.AppUserFallbackFactory; import com.ruoyi.common.core.domain.R; @@ -29,6 +31,13 @@ */ @PostMapping(value = "/t-app-user/user/getUserByIds") public R<List<TAppUser>> getUserByIds(@RequestBody List<Long> appUserIds); + /** + * 远程调用 通过地址id 查询地址信息 + * @param id + * @return + */ + @GetMapping(value = "/t-app-user-address/getAddressById/{id}") + public R<TAppUserAddress> getAddressById(@PathVariable("id") Long id); /** @@ -48,8 +57,10 @@ @PostMapping("/t-app-user/user/updateAppUser") R updateAppUser(@RequestBody TAppUser appUser); - @PostMapping("/t-app-user/user/points/change") - R change(@RequestBody PointChangeDto points); +// @PostMapping("/t-app-user/user/points/change") +// R change(@RequestBody PointChangeDto points); + @PostMapping("/t-app-user/user/points/change/down") + R changeDown(@RequestBody PointChangeDto points); /** * 通过手机号查询用户 @@ -58,4 +69,28 @@ */ @GetMapping("/t-app-user/user/selectByPhone") R<TAppUser> selectByPhone(@RequestParam("phone") String phone); + /** + * 通过手机号模糊查询用户 + * @param phone + * @return + */ + @GetMapping("/t-app-user/user/selectByPhoneLike") + R<List<TAppUser>> selectByPhoneLike(@RequestParam("phone") String phone); + /** + * 远程调用 积分兑换订单 退款回退积分 + * @return + */ + @PostMapping(value = "/t-app-user/refundPoints/{param}") + public R refundPoints(@PathVariable("param")String param); + + @PostMapping(value = "/t-app-user/user/give/vip") + public R giveVip(@RequestBody GiveVipDto giveVipDto); + + + /** + * 获取微信token + * @return + */ + @PostMapping("/wxLogin/getWXToken") + R<String> getWXToken(); } -- Gitblit v1.7.1