From dd8aa15e284c9d4c0c858e22f4130d1785261e01 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 10 三月 2022 09:17:40 +0800
Subject: [PATCH] Merge branch 'hemenkou_dev' into dev

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java |   91 +++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 90 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 490d3e7..81bd154 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
@@ -219,7 +224,7 @@
      * @return 人员详情
      */
     @PostMapping("detailuser")
-    R detailUser(@RequestParam("userId") Long userId);
+    R<LoginUserInfoVO> detailUser(@RequestParam("userId") Long userId);
 
     /**
      * 设置用户标签
@@ -343,6 +348,17 @@
      */
     @PostMapping("adduserbackstageproperty")
     R addUserBackstageProperty(@RequestBody AdministratorsUserVO administratorsUserVO);
+
+
+    /**
+     * 更新
+     *
+     * @param administratorsUserVO
+     *            编辑账户内容
+     * @return 编辑结果
+     */
+    @PostMapping("updateStreet")
+    R updateStreet(@RequestBody AdministratorsUserVO administratorsUserVO);
 
     /**
      * 编辑运营、社区后台账户
@@ -1109,4 +1125,77 @@
      */
     @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);
+
+    /**
+     * 删除用户信息缓存
+     * @param phone
+     */
+    @DeleteMapping("/deleteUserCashByPhone")
+    R deleteUserCashByPhone(@RequestParam("phone") String phone);
 }

--
Gitblit v1.7.1