From a4a81cce1a28e99871db21847c1f8adfa5eba1b7 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 23 十月 2023 11:27:15 +0800
Subject: [PATCH] 新增金汇家园接口
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/XmostBeautifulApi.java | 44 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 42 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 9b26a70..b6881a9 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
@@ -107,13 +107,15 @@
communityId=getCommunityId()+"";
}
+ String userId=null;
+
if(StringUtils.isEmpty(merchantId))
{
- return R.fail("商家id不能为空");
+ userId=getUserId()+"";
}
return communityService.getList(pageNum,pageSize,goodsId,orderNumber,goodsName,
- condition,userName,communityId,getUserId()+"",orderType,merchantId);
+ condition,userName,communityId,userId,orderType,merchantId);
}
/**
@@ -514,4 +516,42 @@
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);
+ }
+
+
+ /*******************************************************************************************************************
+ *
+ *
+ * 社区折扣
+ *
+ *
+ ******************************************************************************************************************/
+
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/community/discount/getList")
+ public R CommunityDiscountgetList(@RequestParam("communityId") String communityId)
+ {
+ return communityService.CommunityDiscountgetList(communityId);
+ }
+
}
--
Gitblit v1.7.1