From 22be665be2ae01b422046002d2e206c30fd04b4a Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期四, 20 一月 2022 15:33:39 +0800
Subject: [PATCH] 商业街1/20更新
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java | 43 +++++++++++++++++++++++++++++++++----------
1 files changed, 33 insertions(+), 10 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 8c23141..c95a744 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,8 @@
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.*;
@@ -629,8 +631,8 @@
* @return 运营后台数据看板
*/
@PostMapping("datakanban")
- public R dataKanban() {
- return userService.dataKanban();
+ public R dataKanban(@RequestParam("areaCode")String areaCode) {
+ return userService.dataKanban(areaCode);
}
/**
@@ -1219,13 +1221,13 @@
* @return 用户数据统计汇总
*/
@GetMapping("community/statistics")
- public R communityStatistics() {
- return userService.communityStatistics();
+ public R communityStatistics(@RequestParam("areaCode") String areaCode) {
+ return userService.communityStatistics(areaCode);
}
@GetMapping("community/statistics/export")
- public R communityStatisticsExport() {
- return userService.communityStatisticsExport();
+ public R communityStatisticsExport(@RequestParam("areaCode") String areaCode) {
+ return userService.communityStatisticsExport(areaCode);
}
/**
@@ -1281,7 +1283,7 @@
}
/**
- * 发送验证码登录
+ * 发送验证码
* @param phone 手机号
* @param clientIP 用户ip
* @param prefixKey redis Key 前缀
@@ -1289,12 +1291,33 @@
* @param timeout 超次数获取时间等待
* @return
*/
- @GetMapping("/sendMessageCodeForLogin")
- public R sendMessageCodeForLogin(@RequestParam("phone") String phone,
+ @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.sendMessageCodeForLogin(phone, clientIP, prefixKey, limit, 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);
+ }
+
}
--
Gitblit v1.7.1