From ea7afc2b5e325f37f60986c48513d5788e22e246 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 30 八月 2023 10:02:27 +0800
Subject: [PATCH] 新增小程序商家端商家列表
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/XmostBeautifulApi.java | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/XmostBeautifulApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/XmostBeautifulApi.java
index 3ab62fc..98e50be 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/XmostBeautifulApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/XmostBeautifulApi.java
@@ -89,10 +89,16 @@
@RequestParam(value = "orderNumber", required = false) String orderNumber,
@RequestParam(value = "goodsName", required = false) String goodsName,
@RequestParam(value = "condition", required = false) String condition,
- @RequestParam(value = "userName", required = false) String userName)
+ @RequestParam(value = "userName", required = false) String userName,
+ @RequestParam(value = "communityId", required = false) String communityId)
{
+
+ if(StringUtils.isEmpty(communityId))
+ {
+ communityId=getCommunityId()+"";
+ }
return communityService.getList(pageNum,pageSize,goodsId,orderNumber,goodsName,
- condition,userName,null,getLoginUserInfo().getUserId()+"","1");
+ condition,userName,communityId,getLoginUserInfo().getUserId()+"","1");
}
/**
@@ -170,5 +176,27 @@
return communityService.conditionData(id);
}
+ /*************************************************************************************
+ *
+ * 路北社区商家模块
+ *
+ **************************************************************************************/
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/getList")
+ public R volunteerMerchantGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "merchantState", required = false) String merchantState,
+ @RequestParam(value = "merchantType", required = false) String merchantType,
+ @RequestParam(value = "name", required = false) String name)
+ {
+ return communityService.volunteerMerchantGetList(pageNum, pageSize,merchantState,merchantType,name,getCommunityId()+"");
+ }
+
+
+
}
--
Gitblit v1.7.1