From ae41759bafec1c2a1e8858fcdcda4272ed4eb84c Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 16 六月 2023 17:43:47 +0800
Subject: [PATCH] 联调bug和订单管理
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtMemberController.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtMemberController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtMemberController.java
index d602696..497ebd4 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtMemberController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtMemberController.java
@@ -3,20 +3,19 @@
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.MgtMemberOrderPageDto;
import com.ruoyi.order.domain.dto.MgtMemberServiceRecordPageDto;
-import com.ruoyi.order.domain.vo.MgtMemberOrderPageVo;
import com.ruoyi.order.domain.vo.MgtMemberServiceRecordPageVo;
+import com.ruoyi.order.domain.vo.MgtMemberServiceTotalVo;
import com.ruoyi.order.service.order.UserServiceRecordService;
-import com.ruoyi.system.api.domain.dto.MgtPageDto;
+import com.ruoyi.system.api.domain.dto.MgtBaseGetDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
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;
/**
@@ -31,7 +30,7 @@
@RequestMapping("/mgt/member")
public class MgtMemberController {
- @Autowired
+ @Resource
private UserServiceRecordService userServiceRecordService;
@RequestMapping(value = "/pageMgtMemberServiceRecord", method = RequestMethod.POST)
@@ -46,5 +45,12 @@
return R.ok(page.setRecords(list));
}
-
+ @RequestMapping(value = "/getMgtMemberServiceTotal", method = RequestMethod.POST)
+ @ApiOperation(value = "获取会员服务统计")
+ public R<MgtMemberServiceTotalVo> getMgtMemberServiceTotal(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
+ Long userId = SecurityUtils.getUserId();
+ mgtBaseGetDto.setUserId(userId);
+ MgtMemberServiceTotalVo mgtMemberServiceTotalVo = userServiceRecordService.getMgtMemberServiceTotal(Long.valueOf(mgtBaseGetDto.getId()));
+ return R.ok(mgtMemberServiceTotalVo);
+ }
}
--
Gitblit v1.7.1