From ff2f0deac5dcf7bb6374ad09847602e116c5d8ea Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 30 八月 2023 14:48:23 +0800
Subject: [PATCH] 新增商品图片字段
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/XmostBeautifulApi.java | 185 ++++++++++++++++-----------------------------
1 files changed, 66 insertions(+), 119 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 d49dcd5..5a082a9 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
@@ -78,6 +78,69 @@
***********************************************************************************************************/
/**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @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,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);
+ }
+
+ /**
* 查询详情
* @param id
* @return
@@ -93,7 +156,7 @@
}
/**
- * 新增
+ * 新增社区
* @param
* @return
*/
@@ -112,7 +175,7 @@
}
/**
- * 更新
+ * 更新社区
* @param item
* @return
*/
@@ -139,7 +202,7 @@
}
/**
- * 核销
+ * 核销社区
* @param id
* @return
*/
@@ -185,126 +248,10 @@
return communityService.volunteerTypeGetList(pageNum,pageSize,"2");
}
- /***********************************************************************************************************
- *
- *
- * 商家订单兑换
- *
- *
- ***********************************************************************************************************/
-
- /**
- * 分页查询
- * @param
- * @return
- */
- @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,getUserId()+"",orderType);
- }
-
- /**
- * 查询详情
- * @param id
- * @return
- */
- @GetMapping("/order/getData")
- public R orderMerchantGetData(@RequestParam("id") String id)
- {
- if(StringUtils.isEmpty(id))
- {
- return R.fail("订单id不能为空");
- }
- return communityService.getData(id);
- }
-
- /**
- * 新增
- * @param
- * @return
- */
- @PostMapping("/order/insertData")
- public R orderMerchantInsertData(@RequestBody VolunteerCreditsExchangeVO item)
- {
- 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.insertData(item);
- }
-
-
- /**
- * 新增用户购买商家商品记录
- * @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/update")
- public R orderMerchantUpdate(@RequestBody VolunteerCreditsExchangeVO item)
- {
- item.setOrderType("2");
- return communityService.update(item);
- }
- /**
- * 删除
- * @param id
- * @return
- */
- @DeleteMapping("/order/delete")
- public R orderMerchantDelete(@RequestParam("id") String id)
- {
- if(StringUtils.isEmpty(id))
- {
- return R.fail("订单id不能为空");
- }
- return communityService.delete(id);
- }
--
Gitblit v1.7.1