From 63cc713ca321f9fb520a0c9b9796085ed31efb29 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 06 一月 2022 16:32:46 +0800
Subject: [PATCH] Merge branch 'phs' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into phs

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index 951f74f..3d778ed 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -8002,6 +8002,25 @@
     R checkStoreIsValid(@RequestParam("userId") Long userId);
 
     /**
+     * 根据account查询微商业街商家信息
+     * @param account
+     * @return
+     */
+    @GetMapping("/microcommercialstreet/getMcsMerchantByAccount")
+    R getMcsMerchantByAccount(@RequestParam("account") String account);
+
+    /**
+     * 完成订单更新/新增商家信息
+     * @param merchantName
+     * @param configId
+     * @param userId
+     * @return
+     */
+    @GetMapping("/microcommercialstreet/updateAfterOrder")
+    R updateMcsMerchantAfterOrder(@RequestParam(value = "merchantName", required = false) String merchantName,
+                                  @RequestParam("configId") Long configId, @RequestParam("userId") Long userId);
+
+    /**
      * 分页查询所有数据
      *
      * @param commonPage 查询实体

--
Gitblit v1.7.1