From c6232cfc36e373f83f45c95d400e09466cc2a7d3 Mon Sep 17 00:00:00 2001 From: yanghui <2536613402@qq.com> Date: 星期五, 14 十月 2022 17:41:45 +0800 Subject: [PATCH] #feat 修改运营平台统计登录人数和新增人员 --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java index 8dc4c55..5a51434 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java @@ -8,6 +8,7 @@ import com.panzhihua.common.model.dtos.community.microCommercialStreet.BindUserPhoneDTO; import com.panzhihua.common.model.dtos.community.microCommercialStreet.LoginWithPhoneDTO; import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsMerchantDTO; +import com.panzhihua.common.model.dtos.partybuilding.ComPbCheckUserDTO; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; @@ -145,7 +146,7 @@ R resetPassword(@RequestParam("userId") Long userId); @GetMapping("/resetPasswordAccount") - R resetPasswordAccount(@RequestParam("type")Integer type,@RequestParam("account")String account); + R resetPasswordAccount(@RequestParam("type")Integer type,@RequestParam("account")String account,@RequestParam("appId")String appId); /** * 批量重置密码用户登录密码默认admin123456 @@ -1267,11 +1268,28 @@ */ @GetMapping("/uuPush") R uuPush(@RequestParam("washPhone")String washPhone,@RequestParam("phone")String phone,@RequestParam("washName")String washName,@RequestParam("orderStatus")Integer orderStatus); - + /** + * 无水洗车推送 + * @param washPhone + * @param phone + * @param washName + * @param orderStatus + * @return + */ + @GetMapping("/wsPush") + R wsPush(@RequestParam("washPhone")String washPhone,@RequestParam("phone")String phone,@RequestParam("washName")String washName,@RequestParam("orderStatus")Integer orderStatus); @GetMapping("/communityList") R communityList(@RequestParam("name") String name, @RequestParam("id") Long id); @PostMapping("/tfLogin") R tfLogin(@RequestBody UuLoginVO uuLoginVO); + + + @GetMapping("/accept") + R accept(@RequestParam("userId")Long userId); + + @PostMapping("/addComPbCheckUser") + R addComPbCheckUser(@RequestBody ComPbCheckUserDTO comPbCheckUserDTO); + } -- Gitblit v1.7.1