From b3ea93fb8b59b2c7a0b505b6dd6114d933eeaa61 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 23 十一月 2023 10:01:04 +0800
Subject: [PATCH] 新增商家线下订
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java
index 6282607..d9689f6 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java
@@ -561,7 +561,7 @@
@ApiOperation(value = "积分商品列表", response = NewFightShoppingVO.class)
@GetMapping("/getFightShoppingList")
public R getFightShoppingList(@RequestParam("pageNum") int pageNum,
- @RequestParam("pageNum") int pageSize,
+ @RequestParam("pageSize") int pageSize,
@RequestParam(value = "goodName", required = false)String goodName,
@RequestParam(value = "goodType", required = false)String goodType,
@RequestParam(value = "id", required = false)String id)
@@ -645,6 +645,19 @@
/**
+ * 每日签到记录列表 前15条
+ * @return
+ */
+ @ApiOperation(value = "每日签到记录列表 前15条", response = IntegratingTaskVO.class)
+ @GetMapping("/IntegratingTask/getEverydayList")
+ public R getEverydayList()
+ {
+ return newStriveForFeign.getEverydayList(getUserId()+"",getCommunityId()+"");
+ }
+
+
+
+ /**
* 添加或者修改积分
* @param item
* @return
@@ -676,10 +689,12 @@
@RequestParam(value = "orderNumber", required = false)String orderNumber,
@RequestParam(value = "goodName", required = false)String goodName,
@RequestParam(value = "name", required = false)String name,
- @RequestParam(value = "cancelType", required = false)String cancelType)
+ @RequestParam(value = "cancelType", required = false)String cancelType,
+ @RequestParam(value = "merchantId", required = false) String merchantId,
+ @RequestParam(value = "orderType", required = false) String orderType)
{
return newStriveForFeign.orderGetList(pageNum,pageSize,userId,goodsId,orderNumber,
- goodName,name,cancelType,getCommunityId()+"");
+ goodName,name,cancelType,getCommunityId()+"",merchantId,orderType);
}
/**
@@ -705,6 +720,7 @@
{
item.setCommunityId(getCommunityId()+"");
item.setUserId(getUserId()+"");
+ item.setOrderType("1");
return newStriveForFeign.orderAddData(item);
}
@@ -766,8 +782,11 @@
}
-
-
-
+ @ApiOperation(value = "获取社区积分排名")
+ @GetMapping("/getIntegralUserRank")
+ public R getIntegralUserRank()
+ {
+ return communityService.getIntegralUserRank(getCommunityId(),getUserId());
+ }
}
--
Gitblit v1.7.1