From 72b44903c7d09fa2480b94597b141415a2534639 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期二, 18 一月 2022 13:24:57 +0800
Subject: [PATCH] Merge branch 'master' into yibin
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java | 71 +++++++++++++++++++++++++++++++++++
1 files changed, 71 insertions(+), 0 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 490d3e7..59403a8 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
@@ -5,6 +5,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.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
@@ -17,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
@@ -1109,4 +1114,70 @@
*/
@GetMapping("/sysTemplateConfig/selectTemplate")
R<SysTemplateConfigVO> selectTemplate(@RequestParam("areaCode")String areaCode,@RequestParam("type")Integer type);
+
+ /**
+ * 微商业街新增商家账号
+ * @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