From 29e6855302b602f8dc3fac25c5e123d2646cf552 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 06 九月 2023 14:53:57 +0800
Subject: [PATCH] 新增社区商家模块系统配置
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/XmostBeautifulApi.java | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 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 78fcd70..1fad699 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
@@ -106,12 +106,6 @@
{
communityId=getCommunityId()+"";
}
-
- if(StringUtils.isEmpty(merchantId))
- {
- return R.fail("商家id不能为空");
- }
-
return communityService.getList(pageNum,pageSize,goodsId,orderNumber,goodsName,
condition,userName,communityId,getUserId()+"",orderType,merchantId);
}
@@ -506,7 +500,33 @@
communityId=getCommunityId()+"";
}
+ if(StringUtils.isEmpty(merchantId))
+ {
+ return R.fail("商家id不能为空");
+ }
+
return communityService.WithdrawGetList(pageNum,pageSize,disposeType, merchantName,merchantId,communityId);
}
+
+ /***************************************************************************************************************
+ *
+ * 路北社区系统配置 商家折扣 兑换地点信息
+ *
+ ****************************************************************************************************************/
+
+ /**
+ * 详情
+ * @param
+ * @return
+ */
+ @GetMapping("/Community/Config/getData")
+ public R ConfiggetData(@RequestParam("communityId") String communityId)
+ {
+ return communityService.ConfiggetData(communityId);
+ }
+
+
+
+
}
--
Gitblit v1.7.1