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/service_community/src/main/java/com/panzhihua/service_community/api/MicroCommercialStreetApi.java | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/MicroCommercialStreetApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/MicroCommercialStreetApi.java
index b12213a..743fe98 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/MicroCommercialStreetApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/MicroCommercialStreetApi.java
@@ -397,4 +397,28 @@
public R getMcsLabelList(@RequestParam("userId") Long userId) {
return mcsLabelService.getMcsLabelList(userId);
}
+
+ /**
+ * 根据account查询微商业街商家信息
+ * @param account
+ * @return
+ */
+ @GetMapping("/getMcsMerchantByAccount")
+ public R getMcsMerchantByAccount(@RequestParam("account") String account) {
+ return mcsMerchantService.getMcsMerchantByAccount(account);
+ }
+
+ /**
+ * 完成订单更新/新增商家信息
+ * @param merchantName
+ * @param configId
+ * @param userId
+ * @return
+ */
+ @GetMapping("/updateAfterOrder")
+ public R updateMcsMerchantAfterOrder(@RequestParam(value = "merchantName", required = false) String merchantName,
+ @RequestParam("configId") Long configId,
+ @RequestParam("userId") Long userId) {
+ return mcsMerchantService.updateOrAddMcsMerchantAfterOrder(merchantName, configId, userId);
+ }
}
--
Gitblit v1.7.1