From ea01357b626ef4dc8326ff39da6f31e17bf2c0f9 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 30 八月 2023 15:29:09 +0800
Subject: [PATCH] 新增小程序判断是否是商家
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/XmostBeautifulApi.java | 130 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 115 insertions(+), 15 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 dfff322..89e1a73 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
@@ -82,23 +82,62 @@
* @param
* @return
*/
- @GetMapping("order/getList")
- public R getList(@RequestParam("pageNum") int pageNum,
- @RequestParam("pageSize") int pageSize,
- @RequestParam(value = "goodsId", required = false) String goodsId,
- @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 = "communityId", required = false) String communityId)
+ @GetMapping("/order/getList")
+ public R orderMerchantGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "goodsId", required = false) String goodsId,
+ @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 = "communityId", required = false) String communityId,
+ @RequestParam(value = "orderType", required = false) String orderType)
{
-
if(StringUtils.isEmpty(communityId))
{
communityId=getCommunityId()+"";
}
return communityService.getList(pageNum,pageSize,goodsId,orderNumber,goodsName,
- condition,userName,communityId,getLoginUserInfo().getUserId()+"","1");
+ condition,userName,communityId,getUserId()+"",orderType);
+ }
+
+ /**
+ * 新增用户购买商家商品记录
+ * @param
+ * @return
+ */
+ @PostMapping("/order/insertMerchantData")
+ public R insertMerchantData(@RequestBody VolunteerCreditsExchangeVO item)
+ {
+
+ if(StringUtils.isEmpty(item.getPalyIntegral()))
+ {
+ return R.fail("请输入兑换积分");
+ }
+
+ LoginUserInfoVO userInfoVO= getLoginUserInfo();
+ if(StringUtils.isEmpty(item.getCommunityId()))
+ {
+ item.setCommunityId(userInfoVO.getCommunityId()+"");
+ }
+ item.setOrderType("2");
+ item.setUserId(userInfoVO.getUserId()+"");
+ item.setNeedScore(userInfoVO.getLoveIntegral());
+ return communityService.insertMerchantData(item);
+ }
+
+
+
+ /**
+ * 更新商家
+ * @param item
+ * @return
+ */
+ @PostMapping("/order/MerchantUpdate")
+ public R orderMerchantUpdate(@RequestBody VolunteerCreditsExchangeVO item)
+ {
+ item.setOrderType("2");
+ return communityService.update(item);
}
/**
@@ -117,7 +156,7 @@
}
/**
- * 新增
+ * 新增社区
* @param
* @return
*/
@@ -129,20 +168,21 @@
{
item.setCommunityId(userInfoVO.getCommunityId()+"");
}
-
+ item.setOrderType("1");
item.setUserId(userInfoVO.getUserId()+"");
item.setNeedScore(userInfoVO.getLoveIntegral());
return communityService.insertData(item);
}
/**
- * 更新
+ * 更新社区
* @param item
* @return
*/
@PostMapping("/order/update")
public R update(@RequestBody VolunteerCreditsExchangeVO item)
{
+ item.setOrderType("1");
return communityService.update(item);
}
@@ -162,7 +202,7 @@
}
/**
- * 核销
+ * 核销社区
* @param id
* @return
*/
@@ -176,5 +216,65 @@
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()+"");
+ }
+
+ /**
+ * 分页查询商家分类
+ * @param
+ * @return
+ */
+ @GetMapping("/VolunteerMerchant/getList")
+ public R merchantvolunteerTypeGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize)
+ {
+ return communityService.volunteerTypeGetList(pageNum,pageSize,"2");
+ }
+
+
+ /**
+ * 获取商家详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/VolunteerMerchant/getById")
+ public R volunteerMerchantGetById(@RequestParam("id") String id)
+ {
+ return communityService.volunteerMerchantGetById(id);
+ }
+
+
+ /**
+ * 是否是商家
+ * @param id
+ * @return
+ */
+ @GetMapping("/VolunteerMerchant/isMerchant")
+ public R isMerchant(@RequestParam("userId") String userId)
+ {
+ return communityService.isMerchant(userId);
+ }
+
+
+
+
+
}
--
Gitblit v1.7.1