From 51ee3c4db2eb49062d3236bf44f95dc22f8f6ac9 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期五, 14 一月 2022 17:59:03 +0800
Subject: [PATCH] 商业街bug修改
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java | 148 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 147 insertions(+), 1 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 8941552..50aeef7 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
@@ -2,6 +2,12 @@
import java.util.List;
+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.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
@@ -14,6 +20,8 @@
import com.panzhihua.common.model.vos.*;
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
import com.panzhihua.common.model.vos.user.*;
+
+import javax.validation.Valid;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -135,6 +143,16 @@
*/
@GetMapping("resetPassword")
R resetPassword(@RequestParam("userId") Long userId);
+
+ /**
+ * 批量重置密码用户登录密码默认admin123456
+ *
+ * @param userIds
+ * 新密码
+ * @return 修改结果
+ */
+ @GetMapping("resetPasswordPatch")
+ R resetPasswordPatch(@RequestParam("userIds") Long[] userIds,@RequestParam("password") String password);
/**
* 某社区后台人员查询
@@ -359,7 +377,7 @@
* @return 角色集合
*/
@PostMapping("/role/listrolebackstage")
- R listRoleBackstage(@RequestParam("communityId") Long communityId);
+ R listRoleBackstage(@RequestParam("communityId") Long communityId,@RequestParam("pageNum")Integer pageNum,@RequestParam("pageSize")Integer pageSize);
/**
* 分页查询后台用户
@@ -1017,4 +1035,132 @@
*/
@GetMapping("checkIsTeam")
R checkCurrentUserIsTeam(@RequestParam("phone") String phone, @RequestParam("communityId") Long communityId);
+
+ /**
+ * 便民服务新增商家账号
+ * @param convenientMerchantDTO
+ * @return 商家用户id
+ */
+ @PostMapping("insertMerchantAccount")
+ R addConvenientMerchantUser(@RequestBody ConvenientMerchantDTO convenientMerchantDTO);
+
+ /**
+ * 修改便民服务商家绑定账号
+ * @param userId
+ * @param account
+ * @return
+ */
+ @PutMapping("putMerchantUserAccount")
+ R putUserAccount(@RequestParam("userId") Long userId, @RequestParam("account") String account);
+
+ /**
+ * 禁用/启用便民服务商家用户
+ * @param disableOrEnableConvenientMerchantDTO
+ * @return
+ */
+ @PutMapping("disableOrEnableMerchantUsers")
+ R disableOrEnableMerchantUsers(@RequestBody DisableOrEnableConvenientMerchantDTO disableOrEnableConvenientMerchantDTO);
+
+ /**
+ * 根据openid维护社区团队里是否注册
+ * @param openid 用户微信唯一标识
+ */
+ @GetMapping("judgeCommunityTeam")
+ void judgeCommunityTeam(@RequestParam("openid") String openid);
+
+ /**
+ * 数据看板升级版
+ *
+ * @return 运营后台数据看板升级版
+ */
+ @PostMapping("datakanbans")
+ R dataKanBans(@RequestBody DataKanBansDto dataKanBansDto);
+
+ /**
+ * 运营后台-用户数据统计汇总
+ * @return 用户数据统计汇总
+ */
+ @GetMapping("community/statistics")
+ R communityStatistics();
+
+ /**
+ * 运营后台-用户数据统计导出
+ * @return 用户数据
+ */
+ @GetMapping("community/statistics/export")
+ R communityStatisticsExport();
+
+ /**
+ * 通过UnionId获取用户信息
+ * @param unionId
+ * @return
+ */
+ @GetMapping("/getByUnionId")
+ R getUserInfoByUnionId(@RequestParam("unionId") String unionId);
+
+ /**
+ * 微商业街新增商家账号
+ * @param mcsMerchantDTO
+ * @return 商家用户id
+ */
+ @PostMapping("insertMcsMerchantAccount")
+ R addMcsMerchantUser(@RequestBody McsMerchantDTO mcsMerchantDTO);
+
+ /**
+ * 微商业街修改商家账号
+ * @param mcsMerchantDTO
+ * @return
+ */
+ @PutMapping("putMcsMerchantUser")
+ R putMcsMerchantUser(@RequestBody McsMerchantDTO mcsMerchantDTO);
+
+ /**
+ * 检查用户是否有效
+ * @param userId
+ * @param type
+ * @return
+ */
+ @PutMapping("checkUserIsValid")
+ Boolean checkUserIsValid(@RequestParam("userId") Long userId, @RequestParam("type") Integer type);
+
+ /**
+ * 根据手机号、用户类型查询用户
+ * @param phone
+ * @param type
+ * @return
+ */
+ @GetMapping("/getSysUserByPhone")
+ R getSysUserByPhone(@RequestParam("phone") String phone, @RequestParam("type") Integer type);
+
+ /**
+ * 发送验证码
+ * @param phone 手机号
+ * @param clientIP 用户ip
+ * @param prefixKey redis Key 前缀
+ * @param limit 获取次数限制
+ * @param timeout 超次数获取时间等待
+ * @return
+ */
+ @GetMapping("/sendMessageCode")
+ 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);
+
+ /**
+ * 根据openId获取微商业街用户
+ * @param openid
+ * @return
+ */
+ @GetMapping("/getMcsUserByOpenId")
+ R getMcsUserByOpenId(@RequestParam("openid") String openid);
+
+ /**
+ * 商业街用户微信授权-绑定手机号
+ * @param bindUserPhoneDTO
+ * @return
+ */
+ @PostMapping("/mcs/bindPhone")
+ R bindOrAddMcsUser(@RequestBody @Valid BindUserPhoneDTO bindUserPhoneDTO);
}
--
Gitblit v1.7.1