From 0c3d9face27e194906bffe046a81b01e18faaef4 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 22 四月 2021 16:33:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 23 +++++++++++++++++++++++
1 files changed, 23 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 354ac0d..5fe979a 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
@@ -1612,6 +1612,15 @@
R listSavePopulationServeExcelVO(@RequestBody List<ComMngPopulationServeExcelVO> list, @RequestParam(value = "communityId") Long communityId);
/**
+ * 确认导入实有人口（有则更新，无则新建）
+ * @param list 用户信息
+ * @param communityId 社区id
+ * @return 导入结果
+ */
+ @PostMapping("/common/data/population/import/confirm")
+ R listSavePopulationConfirm(@RequestBody List<ComMngPopulationServeExcelVO> list, @RequestParam(value = "communityId") Long communityId);
+
+ /**
* 分页查询实有人口
*
* @param comMngPopulationVO 查询参数
@@ -1786,6 +1795,13 @@
@PostMapping("/shop/saveStore")
R saveStore(@RequestBody ShopStoreVO storeVO);
+ /**
+ * 新增店铺
+ * @param storeVO 店铺信息
+ * @return 新增结果
+ */
+ @PostMapping("/shop/addStore")
+ R addStore(@RequestBody ShopStoreVO storeVO);
/**
* 编辑店铺、启用、禁用
@@ -2079,6 +2095,13 @@
R getUserStoreInfo(@RequestParam("userId") Long userId);
/**
+ * 获取用户商户详情
+ * @param account 用户账号
+ */
+ @GetMapping("/shop/getUserStoreInfoByAccount")
+ R<ShopStoreVO> getUserStoreInfoByAccount(@RequestParam("account") String account);
+
+ /**
* 订单导出信息
* @param comShopOrderExportDTO 订单导出信息
* @return 订单导出信息
--
Gitblit v1.7.1