From 12c595079a76967023895b701bd918b85adca5e5 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期四, 30 十二月 2021 18:06:36 +0800
Subject: [PATCH] 微商业街-12/30代码提交

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java |   31 +++++++++++++++++++++++++++++++
 1 files changed, 31 insertions(+), 0 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 874c77b..9af0ac6 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,7 @@
 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.McsMerchantDTO;
 import org.springframework.web.bind.annotation.*;
 
 import com.panzhihua.common.model.dtos.PageDTO;
@@ -1226,4 +1227,34 @@
     public R communityStatisticsExport() {
         return userService.communityStatisticsExport();
     }
+
+    /**
+     * 通过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);
+    }
 }

--
Gitblit v1.7.1