From 8444084e6aa11efa23287e7f82474ac22378a5c4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 01 四月 2025 16:03:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerConsumerController.java | 48 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 42 insertions(+), 6 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..c4dae7b 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
@@ -4,18 +4,23 @@
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.MerConsumerGoodsPageDto;
+import com.ruoyi.order.domain.dto.MerServiceRecordPageDto;
import com.ruoyi.order.domain.dto.MerSureConsumerGoodsDto;
+import com.ruoyi.order.domain.vo.MerConsumerGoodsListVo;
import com.ruoyi.order.domain.vo.MerConsumerGoodsVo;
-import com.ruoyi.order.domain.vo.MerMemberNoClearOrderVo;
+import com.ruoyi.order.domain.vo.MerServiceRecordPageVo;
import com.ruoyi.order.service.order.ConsumerGoodsService;
+import com.ruoyi.order.service.order.UserServiceRecordService;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import lombok.Data;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.extern.log4j.Log4j2;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
import java.util.List;
/**
@@ -25,11 +30,17 @@
* @date 2023年05月05日
* @version: 1.0
*/
-@Data
+@Api(value = "商户端服务相关接口", tags = "商户端服务相关接口", description = "商户端服务相关接口")
+@RestController
+@RequestMapping("/mer/consumer")
+@Log4j2
public class MerConsumerController {
- @Autowired
+ @Resource
private ConsumerGoodsService consumerGoodsService;
+
+ @Resource
+ private UserServiceRecordService userServiceRecordService;
@RequestMapping(value = "/listMerConsumerGoods", method = RequestMethod.POST)
@ApiOperation(value = "获取用户服务列表")
@@ -39,6 +50,8 @@
MerConsumerGoodsVo merConsumerGoodsVo = consumerGoodsService.listMerConsumerGoods(merConsumerGoodsDto);
return R.ok(merConsumerGoodsVo);
}
+
+
@RequestMapping(value = "/sureMerConsumerGoods", method = RequestMethod.POST)
@@ -58,4 +71,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