From 61fe9dde69655e9fe9490b79e364f7d1d3eb147f Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 24 六月 2022 13:25:31 +0800
Subject: [PATCH] Merge branch 'huacheng_uu' into huacheng
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java | 176 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 162 insertions(+), 14 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
index 714866e..c4e9efe 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
@@ -7,6 +7,9 @@
import com.panzhihua.common.model.dtos.DataKanBansDto;
import com.panzhihua.common.model.dtos.community.convenient.ConvenientMerchantDTO;
import com.panzhihua.common.model.dtos.community.convenient.DisableOrEnableConvenientMerchantDTO;
+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 org.springframework.web.bind.annotation.*;
import com.panzhihua.common.model.dtos.PageDTO;
@@ -167,7 +170,7 @@
/**
* 微心愿搜索社区团队人员列表
- *
+ *
* @param param
* 请求参数
* @param communityId
@@ -243,7 +246,7 @@
* @return 人员详情
*/
@PostMapping("detailuser")
- public R detailUser(@RequestParam("userId") Long userId) {
+ public R<LoginUserInfoVO> detailUser(@RequestParam("userId") Long userId) {
return userService.detailUser(userId);
}
@@ -393,6 +396,18 @@
@PostMapping("putuserbackstage")
R putUserBackstage(@RequestBody AdministratorsUserVO administratorsUserVO) {
return userService.putUserBackstage(administratorsUserVO);
+ }
+
+ /**
+ * 更新
+ *
+ * @param administratorsUserVO
+ * 编辑账户内容
+ * @return 编辑结果
+ */
+ @PostMapping("updateStreet")
+ R updateStreet(@RequestBody AdministratorsUserVO administratorsUserVO) {
+ return userService.updateStreetId(administratorsUserVO);
}
/**
@@ -628,8 +643,8 @@
* @return 运营后台数据看板
*/
@PostMapping("datakanban")
- public R dataKanban() {
- return userService.dataKanban();
+ public R dataKanban(@RequestParam("areaCode")String areaCode) {
+ return userService.dataKanban(areaCode);
}
/**
@@ -678,9 +693,14 @@
return userService.updateUserIsPartymember(idCard);
}
+ @PostMapping("updateuserispartymemberByPhone")
+ public R updateUserIsPartymemberByPhone(@RequestParam("phone") String phone) {
+ return userService.updateUserIsPartymemberByPhone(phone);
+ }
+
/**
* 修改用户为非党员状态
- *
+ *
* @param idCard
* 身份证号
* @return 修改结果
@@ -1026,7 +1046,7 @@
/**
* 修改app用户密码
- *
+ *
* @param userInfoAppDTO
* 请求参数
* @return 修改结果
@@ -1038,7 +1058,7 @@
/**
* 添加网格员
- *
+ *
* @param eventGridMemberAddDTO
* 请求参数
* @return 结果
@@ -1050,7 +1070,7 @@
/**
* 网格员管理
- *
+ *
* @param memberRelationDTO
* 请求参数
* @return 网格员列表
@@ -1062,7 +1082,7 @@
/**
* 修改网格员信息
- *
+ *
* @param gridMemberDTO
* 请求参数
* @return 修改结果
@@ -1074,7 +1094,7 @@
/**
* 重置网格员密码
- *
+ *
* @param gridMemberDTO
* 请求参数
* @return 重置结果
@@ -1086,7 +1106,7 @@
/**
* 批量删除网格员
- *
+ *
* @param Ids
* 网格员id集合
* @return 删除结果
@@ -1108,7 +1128,7 @@
/**
* 查询社区的收益说明
- *
+ *
* @param communityId
* 社区id
* @return 收益说明
@@ -1130,7 +1150,7 @@
/**
* 根据用户id查询用户openid
- *
+ *
* @param userId
* 用户id
* @return openid
@@ -1142,7 +1162,7 @@
/**
* 查询社区后台工作人员列表
- *
+ *
* @param communityId
* 社区id
* @return 社区后台工作人员列表
@@ -1203,8 +1223,136 @@
userService.judgeCommunityTeam(openid);
}
+ /**
+ * 数据看板升级版
+ *
+ * @return 运营后台数据看板升级版
+ */
@PostMapping("datakanbans")
public R dataKanBans(@RequestBody DataKanBansDto dataKanBansDto) {
return userService.dataKanBans(dataKanBansDto);
}
+
+ /**
+ * 运营后台-用户数据统计汇总
+ * @return 用户数据统计汇总
+ */
+ @GetMapping("community/statistics")
+ public R communityStatistics(@RequestParam("areaCode") String areaCode) {
+ return userService.communityStatistics(areaCode);
+ }
+
+ @GetMapping("community/statistics/export")
+ public R communityStatisticsExport(@RequestParam("areaCode") String areaCode) {
+ return userService.communityStatisticsExport(areaCode);
+ }
+
+ /**
+ * 通过UnionId获取用户信息
+ * @param unionId
+ * @return
+ */
+ @GetMapping("/getByUnionId")
+ public R getUserInfoByUnionId(@RequestParam("unionId") String unionId) {
+ return userService.getUserInfoByUnionId(unionId);
+ }
+
+ /**
+ * 微商业街新增商家账号
+ * @param mcsMerchantDTO
+ * @return 商家用户id
+ */
+ @PostMapping("insertMcsMerchantAccount")
+ public R addMcsMerchantUser(@RequestBody McsMerchantDTO mcsMerchantDTO) {
+ return userService.addMcsMerchantUser(mcsMerchantDTO);
+ }
+
+ /**
+ * 微商业街修改商家账号
+ * @param mcsMerchantDTO
+ * @return
+ */
+ @PutMapping("putMcsMerchantUser")
+ public R putMcsMerchantUser(@RequestBody McsMerchantDTO mcsMerchantDTO) {
+ return userService.putMcsMerchantUser(mcsMerchantDTO);
+ }
+
+ /**
+ * 检查用户是否有效
+ * @param userId
+ * @param type
+ * @return
+ */
+ @PutMapping("checkUserIsValid")
+ public Boolean checkUserIsValid(@RequestParam("userId") Long userId, @RequestParam("type") Integer type) {
+ return userService.checkUserIsValid(userId, type);
+ }
+
+ /**
+ * 根据手机号、用户类型查询用户
+ * @param phone
+ * @param type
+ * @return
+ */
+ @GetMapping("/getSysUserByPhone")
+ public R getSysUserByPhone(@RequestParam("phone") String phone, @RequestParam("type") Integer type) {
+ return userService.getSysUserByPhone(phone, type);
+ }
+
+ /**
+ * 发送验证码
+ * @param phone 手机号
+ * @param clientIP 用户ip
+ * @param prefixKey redis Key 前缀
+ * @param limit 获取次数限制
+ * @param timeout 超次数获取时间等待
+ * @return
+ */
+ @GetMapping("/sendMessageCode")
+ public R sendMessageCode(@RequestParam("phone") String phone,
+ @RequestParam(value = "clientIP", required = false) String clientIP,
+ @RequestParam("prefixKey") String prefixKey,
+ @RequestParam("limit") Integer limit,
+ @RequestParam("timeout") Integer timeout) {
+ return userService.sendMessageCode(phone, clientIP, prefixKey, limit, timeout);
+ }
+
+ /**
+ * 根据openId获取微商业街用户
+ * @param openid
+ * @return
+ */
+ @GetMapping("/getMcsUserByOpenId")
+ public R getMcsUserByOpenId(@RequestParam("openid") String openid) {
+ return userService.getMcsUserByOpenId(openid);
+ }
+
+ /**
+ * 商业街用户微信授权-绑定手机号
+ * @param bindUserPhoneDTO
+ * @return
+ */
+ @PostMapping("/mcs/bindPhone")
+ public R bindOrAddMcsUser(@RequestBody BindUserPhoneDTO bindUserPhoneDTO) {
+ return userService.bindOrAddMcsUser(bindUserPhoneDTO);
+ }
+
+ /**
+ * 删除用户信息缓存
+ * @param phone
+ */
+ @DeleteMapping("/deleteUserCashByPhone")
+ public R deleteUserCashByPhone(@RequestParam("phone") String phone) {
+ return userService.deleteUserCashByPhone(phone);
+ }
+
+ @PostMapping("/update/user/party/status")
+ public R updateUserPartyStatus(@RequestParam("userId") Long userId) {
+ return userService.updateUserPartyStatus(userId);
+ }
+
+ @PostMapping("/uuLogin")
+ public R uuLogin(@RequestBody UuLoginVO uuLoginVO){
+ return userService.uuLogin(uuLoginVO);
+ }
}
--
Gitblit v1.7.1