From 5814550ca780067f20d6494b5fe8baf729a67dd9 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期日, 07 五月 2023 16:47:14 +0800
Subject: [PATCH] DEMO初步完成
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerConsumerController.java | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerConsumerController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerConsumerController.java
index 55f761c..4fcfe18 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerConsumerController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerConsumerController.java
@@ -3,12 +3,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.order.domain.dto.MerConsumerGoodsDto;
-import com.ruoyi.order.domain.dto.MerMemberNoClearOrderDto;
-import com.ruoyi.order.domain.dto.MerSureConsumerGoodsDto;
-import com.ruoyi.order.domain.vo.MerConsumerGoodsVo;
-import com.ruoyi.order.domain.vo.MerMemberNoClearOrderVo;
+import com.ruoyi.order.domain.dto.*;
+import com.ruoyi.order.domain.vo.*;
import com.ruoyi.order.service.order.ConsumerGoodsService;
+import com.ruoyi.order.service.order.UserServiceRecordService;
+import com.ruoyi.system.api.domain.poji.member.Member;
import io.swagger.annotations.ApiOperation;
import lombok.Data;
import org.springframework.beans.factory.annotation.Autowired;
@@ -31,6 +30,9 @@
@Autowired
private ConsumerGoodsService consumerGoodsService;
+ @Autowired
+ private UserServiceRecordService userServiceRecordService;
+
@RequestMapping(value = "/listMerConsumerGoods", method = RequestMethod.POST)
@ApiOperation(value = "获取用户服务列表")
public R<MerConsumerGoodsVo> listMerConsumerGoods(@RequestBody MerConsumerGoodsDto merConsumerGoodsDto) {
@@ -39,6 +41,8 @@
MerConsumerGoodsVo merConsumerGoodsVo = consumerGoodsService.listMerConsumerGoods(merConsumerGoodsDto);
return R.ok(merConsumerGoodsVo);
}
+
+
@RequestMapping(value = "/sureMerConsumerGoods", method = RequestMethod.POST)
@@ -58,4 +62,27 @@
consumerGoodsService.useMerConsumerGoods(merSureConsumerGoodsDto);
return R.ok();
}
+
+ @RequestMapping(value = "/pageMerConsumerGoodsNum", method = RequestMethod.POST)
+ @ApiOperation(value = "分页获取用户服务次数列表")
+ public R<Page<MerConsumerGoodsListVo>> pageMerConsumerGoodsNum(@RequestBody MerConsumerGoodsPageDto merConsumerGoodsPageDto) {
+ Long userId = SecurityUtils.getUserId();
+ merConsumerGoodsPageDto.setUserId(userId);
+ Page<MerConsumerGoodsListVo> page = new Page<>();
+ page.setSize(merConsumerGoodsPageDto.getPageSize());
+ page.setCurrent(merConsumerGoodsPageDto.getPageNum());
+ List<MerConsumerGoodsListVo> merConsumerGoodsListVos = consumerGoodsService.pageMerConsumerGoodsNum(page,merConsumerGoodsPageDto);
+ return R.ok(page.setRecords(merConsumerGoodsListVos));
+ }
+
+ @RequestMapping(value = "/pageMerMemberServiceRecord", method = RequestMethod.POST)
+ @ApiOperation(value = "分页获取用户服务记录")
+ public R<Page<MerServiceRecordPageVo>> pageMerMemberServiceRecord(@RequestBody MerServiceRecordPageDto merServiceRecordPageDto) {
+ Long userId = SecurityUtils.getUserId();
+ Page<MerServiceRecordPageVo> page = new Page<>();
+ page.setSize(merServiceRecordPageDto.getPageSize());
+ page.setCurrent(merServiceRecordPageDto.getPageNum());
+ List<MerServiceRecordPageVo> merServiceRecordPageVoList = userServiceRecordService.pageMerMemberServiceRecord(page,merServiceRecordPageDto);
+ return R.ok(page.setRecords(merServiceRecordPageVoList));
+ }
}
--
Gitblit v1.7.1