abu/wzj-boot
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(ruoyi): 更新 API 文档注解

Browse Source 
-替换 @Tag 为 @Operation 注解
- 更新 API 接口的 summary 描述
-移除冗余代码和不必要的注释
- 统一使用 io.swagger.v3 包
This commit is contained in:
huk 2025-09-19 17:32:27 +08:00
parent bb082bc1d1
commit 8d76107c27
48 changed files with 420 additions and 482 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-admin/src/main/java/org/dromara/app/AppArticleController.java
View File

@ -3,6 +3,7 @@ package org.dromara.app;
import com.wzj.soopin.content.domain.bo.ArticleBO;
import com.wzj.soopin.content.domain.vo.ArticleVO;
import com.wzj.soopin.content.service.IArticleService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R;
@ -20,7 +21,7 @@ import java.util.List;
public class AppArticleController {
private final IArticleService service;
@Tag(name = "轮播列表")
@Operation(summary = "轮播列表")
@PostMapping("/carousel")
public R<List<ArticleVO>> carousel(@RequestBody ArticleBO bo) {
bo.setType(1);//轮播图

22
ruoyi-admin/src/main/java/org/dromara/app/AppCommentController.java
View File

@ -1,24 +1,16 @@
package org.dromara.app;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.wzj.soopin.content.domain.base.BaseInfoProperties;
import com.wzj.soopin.content.domain.bo.CommentBO;
import com.wzj.soopin.content.domain.po.Comment;
import com.wzj.soopin.content.domain.vo.CommentVO;
import com.wzj.soopin.content.enums.MessageEnum;
import com.wzj.soopin.content.service.CommentService;
import com.wzj.soopin.content.service.MsgService;
import com.wzj.soopin.content.utils.RedisOperator;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.domain.R;
import org.dromara.common.mq.domain.MQMessage;
import org.dromara.common.mq.enums.MQMessageType;
import org.dromara.common.mq.enums.MessageActionEnum;
import org.dromara.common.mq.utils.MqUtil;
import org.dromara.common.redis.redis.RedisCache;
import org.dromara.common.satoken.utils.LoginHelper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -27,14 +19,14 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Slf4j
@Api(tags = "管理端-评论管理接口")
@Tag(name = "管理端-评论管理接口")
@RequestMapping("/app/comment")
@RestController
public class AppCommentController {
@Autowired
private CommentService commentService;
@ApiOperation("查询视频评论列表")
@Operation(summary = "查询视频评论列表")
@PostMapping("/page")
public R<Page<CommentVO>> queryVlogComments(
@RequestBody CommentBO bo,
@ -48,7 +40,7 @@ public class AppCommentController {
}
}
@ApiOperation("发布评论")
@Operation(summary = "发布评论")
@PostMapping("/publish")
public R<Void> publishComment(@RequestBody CommentBO bo) {
try {
@ -60,7 +52,7 @@ public class AppCommentController {
}
}
@ApiOperation("删除评论")
@Operation(summary = "删除评论")
@PostMapping("/delete")
public R<Void> deleteComment(
@ApiParam(value = "评论ID") @RequestParam String commentId) {
@ -74,7 +66,7 @@ public class AppCommentController {
}
}
@ApiOperation("获取评论详情")
@Operation(summary = "获取评论详情")
@GetMapping("/detail")
public R<Map<String, Object>> getCommentDetail(@ApiParam(value = "评论ID") @RequestParam String commentId) {
try {

15
ruoyi-admin/src/main/java/org/dromara/app/AppDictController.java
View File

@ -1,27 +1,25 @@
package org.dromara.app;
import cn.hutool.core.util.ObjectUtil;
import com.wzj.soopin.member.convert.FeedbackConvert;
import com.wzj.soopin.member.domain.bo.FeedbackBO;
import com.wzj.soopin.member.service.IFeedbackService;
import io.swagger.annotations.Api;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.domain.R;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.system.domain.vo.SysDictDataVo;
import org.dromara.system.service.ISysDictDataService;
import org.dromara.system.service.ISysDictTypeService;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.List;
@Slf4j
@Api(tags = "VlogController 短视频相关业务功能的接口")
@Tag(name = "字典数据接口")
@RequestMapping("/app/sys/dict")
@RestController
@AllArgsConstructor
@ -34,6 +32,7 @@ public class AppDictController {
*
* @param dictType 字典类型
*/
@Operation(summary = "根据字典类型查询字典数据信息")
@GetMapping(value = "/type/{dictType}")
public R<List<SysDictDataVo>> dictType(@PathVariable String dictType) {
List<SysDictDataVo> data = dictTypeService.selectDictDataByTypeWithDefaultTenantID(dictType);

31
ruoyi-admin/src/main/java/org/dromara/app/AppFeedbackController.java
View File

@ -1,40 +1,23 @@
package org.dromara.app;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.wzj.soopin.content.domain.bo.*;
import com.wzj.soopin.content.domain.po.Vlog;
import com.wzj.soopin.content.domain.vo.IndexVlogVO;
import com.wzj.soopin.content.service.VlogService;
import com.wzj.soopin.content.service.VlogUploadService;
import com.wzj.soopin.content.utils.QcCloud;
import com.wzj.soopin.content.utils.RedisOperator;
import com.wzj.soopin.member.convert.FeedbackConvert;
import com.wzj.soopin.member.domain.bo.FeedbackBO;
import com.wzj.soopin.member.service.IFeedbackService;
import io.swagger.annotations.Api;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.domain.model.LoginUser;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.satoken.utils.LoginHelper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import static com.wzj.soopin.content.domain.base.BaseInfoProperties.*;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@Slf4j
@Api(tags = "VlogController 短视频相关业务功能的接口")
@Tag(name = "意见反馈")
@RequestMapping("/app/feedback")
@RestController
@AllArgsConstructor
@ -42,7 +25,7 @@ public class AppFeedbackController {
private final IFeedbackService service;
private final FeedbackConvert convert;
@Tag(name = "修改意见反馈备注信息")
@Operation(summary = "修改意见反馈备注信息")
@Log(title = "新增意见反馈", businessType = BusinessType.UPDATE)
@PostMapping("/add")
public R add(@RequestBody FeedbackBO feedback) {

21
ruoyi-admin/src/main/java/org/dromara/app/AppMemberController.java
View File

@ -17,7 +17,6 @@ import com.wzj.soopin.member.domain.vo.AccountBillVO;
import com.wzj.soopin.member.domain.vo.MemberAccountVO;
import com.wzj.soopin.member.domain.vo.MemberBankVO;
import com.wzj.soopin.member.domain.vo.MemberVO;
import com.wzj.soopin.transaction.service.IAccountBillService;
import com.wzj.soopin.member.service.IMemberAccountService;
import com.wzj.soopin.member.service.IMemberBankService;
import com.wzj.soopin.member.service.IMemberService;
@ -26,8 +25,10 @@ import com.wzj.soopin.transaction.convert.WithdrawConvert;
import com.wzj.soopin.transaction.domain.bo.ChargeBO;
import com.wzj.soopin.transaction.domain.bo.WithdrawBO;
import com.wzj.soopin.transaction.enums.WithdrawType;
import com.wzj.soopin.transaction.service.IAccountBillService;
import com.wzj.soopin.transaction.service.IChargeService;
import com.wzj.soopin.transaction.service.IWithdrawService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import me.zhyd.oauth.model.AuthResponse;
@ -45,8 +46,6 @@ import org.dromara.common.social.config.properties.SocialProperties;
import org.dromara.common.social.utils.SocialUtils;
import org.springframework.web.bind.annotation.*;
import java.time.LocalDateTime;
@RestController
@RequestMapping("/app/member")
@Tag(name = "会员管理")
@ -75,7 +74,7 @@ public class AppMemberController {
private final IWithdrawService withdrawService;
private final WithdrawConvert withdrawConvert;
@Tag(name = "获取会员账户信息详细信息")
@Operation(summary = "获取会员账户信息详细信息")
@GetMapping(value = "/info")
public R<MemberVO> getInfo(Long memberId) {
//获取用户信息
@ -89,7 +88,7 @@ public class AppMemberController {
return R.ok(service.getMemberInfo(memberId));
}
@Tag(name = "获取会员账户表详细信息")
@Operation(summary = "获取会员账户表详细信息")
@GetMapping(value = "/account")
public R<MemberAccountVO> accountInfo() {
//获取用户信息
@ -100,7 +99,7 @@ public class AppMemberController {
return R.ok(accountConvert.toVO(accountService.getMemberAccount(loginUser.getUserId())));
}
@Tag(name = "查询账单")
@Operation(summary = "查询账单")
@PostMapping("/bank")
public R<Page<MemberBankVO>> list(@RequestBody MemberBankBO bo,
@RequestBody Page<MemberBank> page) {
@ -115,7 +114,7 @@ public class AppMemberController {
return R.ok(memberBankConvert.toVO(memberPage));
}
@Tag(name = "查询账单")
@Operation(summary = "查询账单")
@PostMapping("/bills")
public R<Page<AccountBillVO>> list(@RequestBody AccountBillBO bo,
@RequestBody Page<AccountBill> page) {
@ -136,7 +135,7 @@ public class AppMemberController {
}
@Tag(name = "绑定推广人")
@Operation(summary = "绑定推广人")
@PostMapping("/bind/spread")
public R<AuthToken> bindSpread(@RequestBody MemberBO bo) {
@ -144,7 +143,7 @@ public class AppMemberController {
return R.ok();
}
@Tag(name = "绑定微信")
@Operation(summary = "绑定微信")
@PostMapping("/bind/wechat")
public R<AuthToken> bindWechat(@RequestBody SocialLoginBody loginBody) {
@ -173,7 +172,7 @@ public class AppMemberController {
return R.ok(authUserData.getToken());
}
@Tag(name = "充值")
@Operation(summary = "充值")
@Log(title = "新增 ", businessType = BusinessType.INSERT)
@PostMapping("/charge")
public R charge(@RequestBody ChargeBO bo) {
@ -188,7 +187,7 @@ public class AppMemberController {
return R.ok(chargeService.charge(chargeConvert.toPo(bo)));
}
@Tag(name = "提现")
@Operation(summary = "提现")
@Log(title = "提现 ", businessType = BusinessType.INSERT)
@PostMapping("/withdraw")
public R withdraw(@RequestBody WithdrawBO bo) {

16
ruoyi-admin/src/main/java/org/dromara/app/AppPayController.java
View File

@ -5,10 +5,11 @@ import com.wzj.soopin.transaction.enums.PaymentMethodEnum;
import com.wzj.soopin.transaction.kit.CashierSupport;
import com.wzj.soopin.transaction.kit.dto.PayParam;
import com.wzj.soopin.transaction.kit.params.dto.CashierParam;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
@ -28,7 +29,7 @@ import org.springframework.web.bind.annotation.*;
*/
@Slf4j
@RestController
@Api(tags = "买家端,收银台接口")
@Tag(name = "收银台接口")
@RequestMapping("/app/payment")
@RequiredArgsConstructor
public class AppPayController {
@ -41,7 +42,7 @@ public class AppPayController {
// @ApiImplicitParam(name = "client", value = "客户端类型", paramType = "path", allowableValues = "PC,H5,WECHAT_MP,APP")
// })
@PostMapping(value = "/tradeDetail")
@ApiOperation(value = "获取支付详情")
@Operation(summary = "获取支付详情")
public R paymentParams(@RequestBody @Validated PayParam payParam) {
CashierParam cashierParam = cashierSupport.cashierParam(payParam);
@ -53,9 +54,8 @@ public class AppPayController {
@ApiImplicitParam(name = "paymentMethod", value = "支付方式", paramType = "path", allowableValues = "WECHAT,ALIPAY"),
@ApiImplicitParam(name = "paymentClient", value = "调起方式", paramType = "path", allowableValues = "APP,NATIVE,JSAPI,H5,MP")
})
@PostMapping(value = "/pay")
@ApiOperation(value = "支付")
@Operation(summary = "支付")
public R payment(
HttpServletRequest request,
HttpServletResponse response,
@ -76,7 +76,7 @@ public class AppPayController {
}
@ApiOperation(value = "支付回调")
@Operation(summary = "支付回调")
@RequestMapping(value = "/callback/{paymentMethod}", method = {RequestMethod.GET, RequestMethod.POST})
public R<Object> callback(HttpServletRequest request, @PathVariable String paymentMethod) {
@ -87,7 +87,7 @@ public class AppPayController {
return R.ok(ResultCode.PAY_SUCCESS);
}
@ApiOperation(value = "支付异步通知")
@Operation(summary = "支付异步通知")
@RequestMapping(value = "/notify/{paymentMethod}", method = {RequestMethod.GET, RequestMethod.POST})
public void notify(HttpServletRequest request, @PathVariable String paymentMethod) {
@ -97,7 +97,7 @@ public class AppPayController {
}
@ApiOperation(value = "查询支付结果")
@Operation(summary = "查询支付结果")
@GetMapping(value = "/result")
public R<Boolean> paymentResult(PayParam payParam) {
return R.ok(cashierSupport.paymentResult(payParam));

7
ruoyi-admin/src/main/java/org/dromara/app/AppProductController.java
View File

@ -8,12 +8,13 @@ import com.wzj.soopin.goods.domain.entity.Product;
import com.wzj.soopin.goods.domain.vo.ProductVO;
import com.wzj.soopin.goods.service.ProductService;
import com.wzj.soopin.goods.service.impl.ProductServiceImpl;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R;
import org.springframework.web.bind.annotation.*;
@Tag(name ="商品信息接口列表")
@Tag(name ="商品")
@RestController
@RequestMapping("/app/product")
@RequiredArgsConstructor
@ -23,14 +24,14 @@ public class AppProductController {
private final ProductConvert convert;
private final ProductService productService;
@Tag(name = "查询商品信息列表")
@Operation(summary = "查询商品信息列表")
@PostMapping("page")
public R<IPage<ProductVO>> page(@RequestBody ProductBo query, Page<Product> page) {
IPage<ProductVO> resultPage = service.getProduct(page, query);
return R.ok(resultPage);
}
@Tag(name ="获取商品信息详细信息")
@Operation(summary = "获取商品信息详细信息")
@GetMapping(value = "/{id}")
public R<ProductVO> getInfo(@PathVariable("id") Long id) {
return R.ok(service.selectById(id));

3
ruoyi-admin/src/main/java/org/dromara/app/AppSearchController.java
View File

@ -9,6 +9,7 @@ import com.wzj.soopin.goods.domain.bo.ProductBo;
import com.wzj.soopin.goods.service.ProductService;
import com.wzj.soopin.member.domain.bo.MemberBO;
import com.wzj.soopin.member.service.IMemberService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@ -34,7 +35,7 @@ public class AppSearchController {
private final IMemberService memberService;
private final VlogService vlogService;
@Tag(name = "视频、商品和用户检索")
@Operation(summary = "视频、商品和用户检索")
@PostMapping("")
public R<IPage<?>> search(@RequestBody SearchBO searchBO, @RequestBody Page page) {
try {

3
ruoyi-admin/src/main/java/org/dromara/app/AppTenantController.java
View File

@ -4,6 +4,7 @@ import com.wzj.soopin.transaction.convert.WithdrawConvert;
import com.wzj.soopin.transaction.domain.bo.WithdrawBO;
import com.wzj.soopin.transaction.enums.WithdrawType;
import com.wzj.soopin.transaction.service.IWithdrawService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R;
@ -25,7 +26,7 @@ public class AppTenantController {
private final IWithdrawService withdrawService;
private final WithdrawConvert withdrawConvert;
@Tag(name = "提现")
@Operation(summary = "提现")
@Log(title = "提现 ", businessType = BusinessType.INSERT)
@PostMapping("/withdraw")
public R withdraw(@RequestBody WithdrawBO bo) {

3
ruoyi-admin/src/main/java/org/dromara/app/AppVersionController.java
View File

@ -2,6 +2,7 @@ package org.dromara.app;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R;
@ -24,7 +25,7 @@ public class AppVersionController {
private final ISysVerisonService sysVerisonService;
@Tag(name ="查询app版本管理")
@Operation(summary = "查询app版本管理")
@PostMapping("/page")
public R<IPage<SysVersionVo>> list(@RequestBody SysVersionBo query, Page<SysVersion> page){
return R.ok(sysVerisonService.getList(page,query));

34
ruoyi-admin/src/main/java/org/dromara/app/AppVlogController.java
View File

@ -8,19 +8,17 @@ import com.wzj.soopin.content.service.VlogService;
import com.wzj.soopin.content.service.VlogUploadService;
import com.wzj.soopin.content.utils.QcCloud;
import io.swagger.annotations.Api;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.domain.model.LoginUser;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.mq.domain.MQMessage;
import org.dromara.common.redis.redis.RedisCache;
import org.dromara.common.satoken.utils.LoginHelper;
import org.springframework.web.bind.annotation.*;
import java.time.LocalDateTime;
@Slf4j
@Api(tags = "VlogController 短视频相关业务功能的接口")
@ -35,7 +33,7 @@ public class AppVlogController {
private final IVlogPullService pullService;
@Tag(name = "首页视频列表")
@Operation(summary = "首页视频列表")
@PostMapping("/indexList")
public R<Page<IndexVlogVO>> indexList(@RequestBody IndexListBO bo, @RequestBody Page page) {
@ -43,6 +41,7 @@ public class AppVlogController {
return R.ok(pages);
}
@Operation(summary = "视频详情")
@GetMapping("/detail/{vlogId}")
public R<Object> detail(@PathVariable String vlogId) {
@ -50,7 +49,7 @@ public class AppVlogController {
}
@Tag(name = "我的私密视频列表")
@Operation(summary = "我的私密视频列表")
@PostMapping("/myPrivateList")
public R<Page<IndexVlogVO>> myPrivateList(@RequestBody MyListBO bo, @RequestBody Page page) {
LoginUser loginUser = LoginHelper.getLoginUser();
@ -62,7 +61,7 @@ public class AppVlogController {
return R.ok(pages);
}
@Tag(name = "我点赞的视频列表")
@Operation(summary = "我点赞的视频列表")
@PostMapping("/myLikedList")
public R<Page<IndexVlogVO>> myLikedList(@RequestBody MyLikedVlogBO bo, @RequestBody Page page) {
@ -70,7 +69,7 @@ public class AppVlogController {
return R.ok(pages);
}
@Tag(name = "我关注的人的视频列表")
@Operation(summary = "我关注人的视频列表")
@PostMapping("/followList")
public R<Page<IndexVlogVO>> followList(@RequestBody SimpleListBO bo, @RequestBody Page page) {
LoginUser loginUser = LoginHelper.getLoginUser();
@ -82,7 +81,7 @@ public class AppVlogController {
return R.ok(pages);
}
@Tag(name = "好友视频列表")
@Operation(summary = "好友视频列表")
@PostMapping("/friendList")
public R<Page<IndexVlogVO>> friendList(@RequestBody SimpleListBO bo, @RequestBody Page page) {
LoginUser loginUser = LoginHelper.getLoginUser();
@ -94,25 +93,22 @@ public class AppVlogController {
return R.ok(pages);
}
/**
* 上传视频到云点播
* @param vlogBO
* @return
* @throws Exception
*/
@Operation(summary = "上传视频到云点播")
@PostMapping("publish")
public R<Void> publish(@RequestBody VlogBO vlogBO) throws Exception {
vlogService.createVlog(vlogBO);
return R.ok();
}
@Tag(name = "我的公开视频列表")
@Operation(summary = "我的公开视频列表")
@PostMapping("/myPublicList")
public R<Page<IndexVlogVO>> myPublicList(@RequestBody MyListBO bo, @RequestBody Page page) {
Page<IndexVlogVO> pages = vlogService.queryMyVlogList(bo, page);
return R.ok(pages);
}
@Operation(summary = "点赞")
@PostMapping("/like")
public R<Void> like(@RequestBody VlogBO vlogBO) {
LoginUser loginUser = LoginHelper.getLoginUser();
@ -128,6 +124,7 @@ public class AppVlogController {
@Operation(summary = "取消点赞")
@PostMapping("/unlike")
public R<Void> unlike(@RequestBody VlogBO vlogBO) {
LoginUser loginUser = LoginHelper.getLoginUser();
@ -139,6 +136,8 @@ public class AppVlogController {
vlogService.userUnLikeVlog(userId, vlogId);
return R.ok();
}
@Operation(summary = "已读视频")
@GetMapping("/read")
public R<Void> read(@RequestBody VlogBO vlogBO) {
LoginUser loginUser = LoginHelper.getLoginUser();
@ -148,6 +147,7 @@ public class AppVlogController {
vlogService.readVlog(loginUser.getUserId(), vlogBO.getId());
return R.ok();
}
@Operation(summary = "删除视频")
@DeleteMapping("/delete/{id}")
public R<Void> delete(@PathVariable String id) {
LoginUser loginUser = LoginHelper.getLoginUser();
@ -157,6 +157,8 @@ public class AppVlogController {
vlogService.removeById(id);
return R.ok();
}
@Operation(summary = "视频列表")
@PostMapping("/page")
public R<Page<IndexVlogVO>> page(@RequestBody VlogBO vlogBO) {
LoginUser loginUser = LoginHelper.getLoginUser();
@ -168,7 +170,7 @@ public class AppVlogController {
}
@Tag(name = "手动触发缓存点赞最多视频")
@Operation(summary = "手动触发缓存点赞最多视频")
@PostMapping("/cacheTopLikedVlogs")
public R<Void> cacheTopLikedVlogs(@RequestParam(defaultValue = "100") int limit) {
try {

35
ruoyi-admin/src/main/java/org/dromara/app/customer/AppOrderController.java
View File

@ -1,18 +1,15 @@
package org.dromara.app.customer;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.wzj.soopin.content.utils.RedisOperator;
import com.wzj.soopin.order.business.IOrderBusiness;
import com.wzj.soopin.order.domain.bo.OrderBo;
import com.wzj.soopin.order.domain.bo.SaveOrderBO;
import com.wzj.soopin.order.domain.entity.Order;
import com.wzj.soopin.order.domain.vo.ManagerOrderDetailVO;
import com.wzj.soopin.order.domain.vo.OrderVO;
import com.wzj.soopin.order.service.IMemberOrderService;
import com.wzj.soopin.order.service.OrderService;
import com.wzj.soopin.order.service.VerificationCodeService;
import io.swagger.annotations.Api;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@ -25,7 +22,7 @@ import org.springframework.web.bind.annotation.*;
@Slf4j
@Api(tags = "订单相关接口")
@Tag(name = "订单")
@RequestMapping("/app/order")
@RestController
@RequiredArgsConstructor
@ -39,7 +36,8 @@ public class AppOrderController {
private final IOrderBusiness orderBusiness;
public RedisOperator redis;
@Tag(name ="查询订单列表")
@Operation(summary = "查询订单列表")
@PostMapping("/page")
public R<IPage<OrderVO>> page(@RequestBody OrderBo bo){
LoginUser loginUser= LoginHelper.getLoginUser();
@ -48,32 +46,23 @@ public class AppOrderController {
return R.ok(memberOrderService.page(bo));
}
/**
* 获取订单详细信息
* @param id 订单id
* @return
*/
@Operation(summary = "获取订单详细信息")
@GetMapping(value = "/{id}")
public R<OrderVO> getInfo(@PathVariable("id") Long id) {
return R.ok(orderBusiness.info(id));
}
/**
* 生成订单
* @param saveOrderBO
* @return
*/
@Operation(summary = "生成订单")
@Log(title = "生成订单", businessType = BusinessType.INSERT)
@PostMapping("/add")
public R<OrderVO> add(@RequestBody SaveOrderBO saveOrderBO) {
return R.ok(orderService.saveOrder(saveOrderBO));
}
/**
* 取消订单
* @param orderId
* @return
*/
@Operation(summary = "取消订单")
@Log(title = "取消订单", businessType = BusinessType.UPDATE)
@PostMapping("/cancel/{orderId}")
public R<OrderVO> cancel(@PathVariable("orderId") Long orderId) {
@ -83,9 +72,7 @@ public class AppOrderController {
/**
* 生成核销码
*/
@Operation(summary = "生成核销码")
@GetMapping("/generate/{orderId}")
@Tag(name = "生成核销码")
public R generateCode(@PathVariable Long orderId) {

21
ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/ArticleCategoryController.java
View File

@ -3,16 +3,11 @@ package com.wzj.soopin.content.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.wzj.soopin.content.convert.ArticleCategoryConvert;
import com.wzj.soopin.content.convert.ArticleConvert;
import com.wzj.soopin.content.domain.bo.ArticleBO;
import com.wzj.soopin.content.domain.bo.ArticleCategoryBO;
import com.wzj.soopin.content.domain.po.Article;
import com.wzj.soopin.content.domain.po.ArticleCategory;
import com.wzj.soopin.content.domain.vo.ArticleCategoryVO;
import com.wzj.soopin.content.domain.vo.ArticleVO;
import com.wzj.soopin.content.service.IArticleCategoryService;
import com.wzj.soopin.content.service.IArticleService;
import com.wzj.soopin.member.domain.bo.TenantForbiddenBO;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R;
@ -34,40 +29,40 @@ public class ArticleCategoryController {
private final IArticleCategoryService service;
private final ArticleCategoryConvert convert;
@Tag(name = "查询列表")
@Operation(summary = "查询列表")
@PostMapping("/page")
public R<IPage<ArticleCategoryVO>> page(@RequestBody ArticleCategoryBO bo, @RequestBody Page page) {
Page<ArticleCategory> pages = service.page(page, bo.toWrapper());
return R.ok(convert.toVO(pages));
}
@Tag(name = "查询列表")
@Operation(summary = "查询列表")
@PostMapping("/list")
public R< List<ArticleCategoryVO>> list(@RequestBody ArticleCategoryBO bo, @RequestBody Page page) {
List<ArticleCategory> articleList = service.list( bo.toWrapper());
return R.ok(convert.toVO(articleList));
}
@Tag(name = "查询列表")
@Operation(summary = "查询树形列表")
@PostMapping("/tree")
public R< List<ArticleCategoryVO>> tree(@RequestBody ArticleCategoryBO bo ) {
List<ArticleCategoryVO> articleList = service.tree( bo.toWrapper());
return R.ok( articleList);
}
@Tag(name = "新增")
@Operation(summary = "新增")
@Log(title = "新增 ", businessType = BusinessType.INSERT)
@PostMapping("/add")
public R add(@RequestBody ArticleCategoryBO bo) {
return R.ok(service.save(convert.toPo(bo)));
}
@Tag(name = "详情")
@Operation(summary = "详情")
@GetMapping(value = "/{id}")
public R<ArticleCategoryVO> getInfo(@PathVariable("id") Long id) {
return R.ok(convert.toVO(service.getById(id)));
}
@Tag(name = ("处理"))
@Operation(summary = "修改")
@Log(title = "修改", businessType = BusinessType.UPDATE)
@PostMapping("/update")
public R update(@RequestBody ArticleCategoryBO bo) {
@ -76,7 +71,7 @@ public class ArticleCategoryController {
}
@Tag(name = "删除")
@Operation(summary = "删除")
@Log(title = "删除", businessType = BusinessType.DELETE)
@DeleteMapping("/{id}")
public R<Object> remove(@PathVariable Long id) {

21
ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/ArticleController.java
View File

@ -6,13 +6,8 @@ import com.wzj.soopin.content.convert.ArticleConvert;
import com.wzj.soopin.content.domain.bo.ArticleBO;
import com.wzj.soopin.content.domain.po.Article;
import com.wzj.soopin.content.domain.vo.ArticleVO;
import com.wzj.soopin.content.service.IArticleCategoryService;
import com.wzj.soopin.content.service.IArticleService;
import com.wzj.soopin.member.convert.TenantForbiddenConvert;
import com.wzj.soopin.member.domain.bo.TenantForbiddenBO;
import com.wzj.soopin.member.domain.po.TenantForbidden;
import com.wzj.soopin.member.domain.vo.TenantForbiddenVO;
import com.wzj.soopin.member.service.ITenantForbiddenService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R;
@ -34,34 +29,34 @@ public class ArticleController {
private final IArticleService service;
private final ArticleConvert convert;
@Tag(name = "查询列表")
@Operation(summary = "分页查询")
@PostMapping("/page")
public R<IPage<ArticleVO>> page(@RequestBody ArticleBO bo, @RequestBody Page page) {
Page<Article> pages = service.page(page, bo.toWrapper());
return R.ok(convert.toVO(pages));
}
@Tag(name = "查询列表")
@Operation(summary = "查询列表")
@PostMapping("/list")
public R< List<ArticleVO>> list(@RequestBody ArticleBO bo, @RequestBody Page page) {
List<ArticleVO> articleList = service.selectVoList( bo.toWrapper());
return R.ok(articleList);
}
@Tag(name = "新增")
@Operation(summary = "新增")
@Log(title = "新增 ", businessType = BusinessType.INSERT)
@PostMapping("/add")
public R add(@RequestBody ArticleBO bo) {
return R.ok(service.save(convert.toPo(bo)));
}
@Tag(name = "详情")
@Operation(summary = "详情")
@GetMapping(value = "/{id}")
public R<ArticleVO> getInfo(@PathVariable("id") Long id) {
return R.ok(convert.toVO(service.getById(id)));
}
@Tag(name = ("处理"))
@Operation(summary = "修改")
@Log(title = "修改", businessType = BusinessType.UPDATE)
@PostMapping("/update")
public R update(@RequestBody ArticleBO bo) {
@ -70,7 +65,7 @@ public class ArticleController {
}
@Tag(name = "删除")
@Operation(summary = "删除")
@Log(title = "删除", businessType = BusinessType.DELETE)
@DeleteMapping("/{id}")
public R<Object> remove(@PathVariable Long id) {
@ -78,7 +73,7 @@ public class ArticleController {
}
@Tag(name = "轮播列表")
@Operation(summary = "轮播列表")
@PostMapping("/carousel")
public R< List<ArticleVO>> carousel(@RequestBody ArticleBO bo, @RequestBody Page page) {
bo.setType(1);//轮播图

39
ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/VlogController.java
View File

@ -1,41 +1,28 @@
package com.wzj.soopin.content.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.wzj.soopin.content.domain.base.BaseInfoProperties;
import com.wzj.soopin.content.domain.bo.*;
import com.wzj.soopin.content.domain.po.Article;
import com.wzj.soopin.content.domain.vo.ArticleVO;
import com.wzj.soopin.content.domain.bo.VlogBO;
import com.wzj.soopin.content.domain.vo.IndexVlogVO;
import com.wzj.soopin.content.enums.YesOrNo;
import com.wzj.soopin.content.service.IVlogPullService;
import com.wzj.soopin.content.service.IVlogPushService;
import lombok.AllArgsConstructor;
import org.dromara.common.core.domain.R;
import com.wzj.soopin.content.service.VlogService;
import com.wzj.soopin.content.service.VlogUploadService;
import com.wzj.soopin.content.utils.PagedGridResult;
import com.wzj.soopin.content.utils.QcCloud;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import com.wzj.soopin.content.utils.RedisOperator;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.domain.R;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
import java.util.ArrayList;
@Slf4j
@Api(tags = "VlogController 短视频相关业务功能的接口")
@Tag(name = "短视频相关业务功能的接口")
@RequestMapping("/cms/vlog")
@RestController
@AllArgsConstructor
@ -44,7 +31,8 @@ public class VlogController extends BaseInfoProperties {
public final RedisOperator redis;
private final IVlogPushService vlogPushService;
private final IVlogPullService vlogPullService;
@Tag(name = "查询列表")
@Operation(summary = "查询列表")
@PostMapping("/page")
public R<IPage<IndexVlogVO>> page(@RequestBody VlogBO bo, @RequestBody Page page) {
Page<IndexVlogVO> pages = vlogService.getIndexVlogList(bo ,page);
@ -164,6 +152,7 @@ public class VlogController extends BaseInfoProperties {
@Operation(summary = "修改视频状态")
@PostMapping("/changeVlogStatus")
public R<Void> changeVlogStatus(@RequestParam String userId,
@RequestParam String vlogId,
@ -172,6 +161,7 @@ public class VlogController extends BaseInfoProperties {
return R.ok();
}
@Operation(summary = "修改视频为私密")
@PostMapping("/changeToPrivate")
public R<Void> changeToPrivate(@RequestParam String userId,
@RequestParam String vlogId) {
@ -181,6 +171,7 @@ public class VlogController extends BaseInfoProperties {
return R.ok();
}
@Operation(summary = "修改视频为公开")
@PostMapping("/changeToPublic")
public R<Void> changeToPublic(@RequestParam String userId,
@RequestParam String vlogId) {
@ -190,15 +181,19 @@ public class VlogController extends BaseInfoProperties {
return R.ok();
}
@Operation(summary = "查询视频被点赞数量")
@PostMapping("/totalLikedCounts")
public R<Integer> totalLikedCounts(@RequestParam String vlogId) {
return R.ok(vlogService.getVlogBeLikedCounts(vlogId));
}
@Operation(summary = "推送视频")
@GetMapping("/push")
public R pushMember(@RequestParam int count,@RequestParam String tag) {
return R.ok(vlogPushService.pushVlogToMq(count,tag));
}
@Operation(summary = "同步视频")
@GetMapping("/sync")
public R syncVlog() {
// vlogPullService.pullFromTencentCloud();

30
ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/admin/CommentController.java
View File

@ -3,36 +3,24 @@ package com.wzj.soopin.content.controller.admin;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.wzj.soopin.content.domain.bo.CommentBO;
import com.wzj.soopin.content.domain.po.Comment;
import com.wzj.soopin.content.domain.vo.CommentVO;
import com.wzj.soopin.content.domain.vo.ChildCommentVO;
import com.wzj.soopin.content.domain.vo.CommentVO;
import com.wzj.soopin.content.service.CommentService;
// import com.wzj.soopin.content.utils.PagedGridResult;
import io.swagger.annotations.Api;
import com.wzj.soopin.content.service.MsgService;
import com.wzj.soopin.content.utils.RedisOperator;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.domain.R;
// import org.dromara.common.mybatis.core.page.PageQuery;
// import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.common.web.core.BaseController;
// import org.dromara.common.core.constant.HttpStatus;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
import java.util.HashMap;
import com.wzj.soopin.content.utils.RedisOperator;
import com.wzj.soopin.content.service.MsgService;
import com.wzj.soopin.content.domain.base.BaseInfoProperties;
import com.wzj.soopin.content.enums.MessageEnum;
// import com.wzj.soopin.content.domain.po.Comment;
@Slf4j
@Api(tags = "管理端-评论管理接口")
@Tag(name = "管理端-评论管理接口")
@RequestMapping("/cms/comment")
@RestController
public class CommentController extends BaseController {
@ -46,7 +34,7 @@ public class CommentController extends BaseController {
@Autowired
private MsgService msgService;
@ApiOperation("获取评论列表")
@Operation(summary = "获取评论列表")
@PostMapping("/list")
public R<Page<CommentVO>> list(
@RequestBody CommentBO bo,
@ -60,7 +48,7 @@ public class CommentController extends BaseController {
@ApiOperation("获取子评论列表")
@Operation(summary = "获取子评论列表")
@GetMapping("/childList")
public R<Page<ChildCommentVO>> getChildComments(
@RequestParam String fatherCommentId,
@ -71,7 +59,7 @@ public class CommentController extends BaseController {
return R.ok(page);
}
@ApiOperation("下架评论")
@Operation(summary = "下架评论")
@PostMapping("/offline")
public R<Void> offlineComment(@ApiParam(value = "评论ID") @RequestParam String commentId) {
try {

31
ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/admin/VlogUploadController.java
View File

@ -1,26 +1,23 @@
package com.wzj.soopin.content.controller.admin;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.tencentcloudapi.vod.v20180717.models.*;
import com.wzj.soopin.content.domain.base.BaseInfoProperties;
import com.wzj.soopin.content.domain.bo.VlogBO;
import com.wzj.soopin.content.service.VlogService;
import com.wzj.soopin.content.service.VlogUploadService;
import com.wzj.soopin.content.utils.RedisOperator;
import org.dromara.common.redis.utils.RedisUtils;
import com.wzj.soopin.content.utils.TencentCloudUtil;
import com.wzj.soopin.member.service.IFansService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.v3.oas.annotations.Operation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.dromara.common.core.domain.R;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.apache.commons.lang3.StringUtils;
import java.util.*;
import java.util.Collections;
import java.util.List;
import java.util.Map;
@Slf4j
@Api(tags = "管理端-视频")
@ -43,9 +40,8 @@ public class VlogUploadController extends BaseInfoProperties {
@Autowired
private IFansService fansService;
/**
* 视频审核接口
*/
@Operation(summary = "视频审核接口")
@PostMapping("/audit")
public R<Void> auditVlog(@RequestParam String vlogId,
@RequestParam Integer status,
@ -59,9 +55,8 @@ public class VlogUploadController extends BaseInfoProperties {
}
}
/**
* 视频删除接口
*/
@Operation(summary = "视频删除接口")
@PostMapping("/delete")
public R<Void> deleteVlog(@RequestParam String vlogId) {
try {
@ -73,9 +68,7 @@ public class VlogUploadController extends BaseInfoProperties {
}
}
/**
* 视频详情接口
*/
@Operation(summary = "视频详情接口")
@GetMapping("/detail")
public R<Map<String, Object>> vlogDetail(@RequestParam String fileId) {
try {
@ -96,7 +89,7 @@ public class VlogUploadController extends BaseInfoProperties {
}
}
@ApiOperation(value = "禁播/解禁视频", notes = "禁播/解禁视频接口")
@Operation(summary = "视频禁播/解禁接口")
@PostMapping("/forbid")
public R<Void> forbidMediaDistribution(@RequestBody Map<String, Object> params) {
try {
@ -148,7 +141,7 @@ public class VlogUploadController extends BaseInfoProperties {
}
}
@ApiOperation(value = "根据vlogerId查询用户信息", notes = "查询视频上传者的姓名和电话")
@Operation(summary = "根据vlogerId查询用户信息")
@GetMapping("/user-info")
public R<Map<String, String>> getUserInfoByVlogerId(@RequestParam String vlogerId) {
try {

20
ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/BrandController.java
View File

@ -4,12 +4,10 @@ package com.wzj.soopin.goods.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.wzj.soopin.goods.convert.BrandConvert;
import com.wzj.soopin.goods.domain.bo.BrandBo;
import com.wzj.soopin.goods.domain.bo.ProductCategoryBo;
import com.wzj.soopin.goods.domain.entity.Brand;
import com.wzj.soopin.goods.domain.entity.ProductCategory;
import com.wzj.soopin.goods.domain.vo.BrandVO;
import com.wzj.soopin.goods.domain.vo.ProductCategoryVO;
import com.wzj.soopin.goods.service.impl.BrandServiceImpl;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R;
@ -26,7 +24,7 @@ import java.util.List;
* @author zcc
* @date 2022-11-28
*/
@Tag(name ="品牌管理接口列表")
@Tag(name ="品牌管理")
@RestController
@RequestMapping("/pms/brand")
@RequiredArgsConstructor
@ -36,14 +34,14 @@ public class BrandController extends BaseController {
private final BrandConvert convert;
@Tag(name ="所有品牌管理列表")
@Operation(summary = "所有品牌管理列表")
@PostMapping("list")
public R<Page<BrandVO>> list(@RequestBody BrandBo query, Page<Brand> page) {
Page<Brand> brandPage = service.page(page,query.toWrapper());
return R.ok(convert.toVO(brandPage));
}
@Tag(name ="所有品牌管理列表")
@Operation(summary = "所有品牌管理列表")
@PostMapping("page")
public R<List<BrandVO>> list(@RequestBody BrandBo query) {
List<Brand> productCategoryList = service.list(query.toWrapper());
@ -51,7 +49,7 @@ public class BrandController extends BaseController {
}
@Tag(name ="导出品牌管理列表")
@Operation(summary = "导出品牌管理列表")
@Log(title = "品牌管理", businessType = BusinessType.EXPORT)
@PostMapping("export")
public R<String> export(BrandBo query) {
@ -61,27 +59,27 @@ public class BrandController extends BaseController {
}
@Tag(name ="获取品牌管理详细信息")
@Operation(summary = "获取品牌管理详细信息")
@GetMapping(value = "/{id}")
public R getInfo(@PathVariable("id") Long id) {
return R.ok(service.getById(id));
}
@Tag(name ="新增品牌管理")
@Operation(summary = "新增品牌管理")
@Log(title = "品牌管理", businessType = BusinessType.INSERT)
@PostMapping("/add")
public R add(@RequestBody Brand brand) {
return R.ok(service.save(brand));
}
@Tag(name ="修改品牌管理")
@Operation(summary = "修改品牌管理")
@Log(title = "品牌管理", businessType = BusinessType.UPDATE)
@PostMapping("/update")
public R edit(@RequestBody Brand brand) {
return R.ok(service.updateById(brand));
}
@Tag(name ="删除品牌管理")
@Operation(summary = "删除品牌管理")
@Log(title = "品牌管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{id}")
public R remove(@PathVariable Long id) {

17
ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/ProductCategoryController.java
View File

@ -7,6 +7,7 @@ import com.wzj.soopin.goods.domain.bo.ProductCategoryBo;
import com.wzj.soopin.goods.domain.entity.ProductCategory;
import com.wzj.soopin.goods.domain.vo.ProductCategoryVO;
import com.wzj.soopin.goods.service.impl.ProductCategoryServiceImpl;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R;
@ -24,7 +25,7 @@ import java.util.List;
* @author zcc
* @date 2022-11-28
*/
@Tag(name ="商品分类接口列表")
@Tag(name ="商品分类")
@RestController
@RequestMapping("/pms/product/category")
@RequiredArgsConstructor
@ -35,46 +36,46 @@ public class ProductCategoryController extends BaseController {
private final ProductCategoryServiceImpl service;
private final ProductCategoryConvert convert;
@Tag(name = "查询列表")
@Operation(summary = "查询列表")
@PostMapping("/tree")
public R< List<ProductCategoryVO>> tree(@RequestBody ProductCategoryBo bo ) {
List<ProductCategoryVO> articleList = service.tree( bo.toWrapper());
return R.ok( articleList);
}
@Tag(name = "查询列表")
@Operation(summary = "查询列表")
@PostMapping("/page")
public R<IPage<ProductCategoryVO>> page(@RequestBody ProductCategoryBo bo, @RequestBody Page page) {
Page<ProductCategory> pages = service.page(page, bo.toWrapper());
return R.ok(convert.toVO(pages));
}
@Tag(name ="查询商品分类列表")
@Operation(summary = "查询商品分类列表")
@PostMapping("list")
public R<List<ProductCategoryVO>> list(@RequestBody ProductCategoryBo query) {
List<ProductCategory> productCategoryList = service.list(query.toWrapper());
return R.ok(convert.toVO(productCategoryList));
}
@Tag(name ="获取商品分类详细信息")
@Operation(summary = "获取商品分类详细信息")
@GetMapping(value = "/{id}")
public R getInfo(@PathVariable("id") Long id) {
return R.ok(service.getById(id));
}
@Tag(name ="获取商品分类详细信息")
@Operation(summary = "获取商品分类详细信息")
@Log(title = "商品分类", businessType = BusinessType.INSERT)
@PostMapping("/add")
public R add(@RequestBody ProductCategory productCategory) {
return R.ok(service.save(productCategory));
}
@Tag(name ="修改商品分类")
@Operation(summary = "修改商品分类")
@Log(title = "商品分类", businessType = BusinessType.UPDATE)
@PostMapping("/update")
public R edit(@RequestBody ProductCategory productCategory) {
return R.ok(service.updateById(productCategory));
}
@Tag(name ="删除商品分类")
@Operation(summary = "删除商品分类")
@Log(title = "商品分类", businessType = BusinessType.DELETE)
@DeleteMapping("/{id}")
public R remove(@PathVariable Long id) {

14
ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/SkuController.java
View File

@ -7,13 +7,13 @@ import com.wzj.soopin.goods.domain.bo.SkuBo;
import com.wzj.soopin.goods.domain.entity.Sku;
import com.wzj.soopin.goods.domain.vo.SkuVO;
import com.wzj.soopin.goods.service.impl.SkuServiceImpl;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R;
import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.common.web.core.BaseController;
import org.springframework.web.bind.annotation.*;
@ -33,13 +33,13 @@ public class SkuController extends BaseController {
private final SkuServiceImpl service;
private final SkuConvert convert;
@Tag(name ="查询商品信息列表")
@Operation(summary = "查询商品信息列表")
@PostMapping("list")
public R<IPage<SkuVO>> list(@RequestBody SkuBo query, Page<Sku> page) {
return R.ok(service.getList(query,page));
}
@Tag(name ="导出sku信息列表")
@Operation(summary = "导出sku信息列表")
@Log(title = "sku信息", businessType = BusinessType.EXPORT)
@PostMapping("export")
public R<String> export(SkuBo query) {
@ -48,13 +48,13 @@ public class SkuController extends BaseController {
return R.ok(util.writeExcel(convert.toVO(list), "sku信息数据"));
}
@Tag(name ="获取sku信息详细信息")
@Operation(summary = "获取sku信息详细信息")
@GetMapping(value = "/{id}")
public R getInfo(@PathVariable("id") Long id) {
return R.ok(service.selectSkuByid(id));
}
@Tag(name ="新增sku信息")
@Operation(summary = "新增sku信息")
@Log(title = "sku信息", businessType = BusinessType.INSERT)
@PostMapping("/add")
public R add(@RequestBody Sku sku) {
@ -62,14 +62,14 @@ public class SkuController extends BaseController {
return R.ok();
}
@Tag(name ="修改sku信息")
@Operation(summary = "修改sku信息")
@Log(title = "sku信息", businessType = BusinessType.UPDATE)
@PostMapping("/update")
public R edit(@RequestBody Sku sku) {
return R.ok(service.updateById(sku));
}
@Tag(name ="删除sku信息")
@Operation(summary = "删除sku信息")
@Log(title = "sku信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{id}")
public R remove(@PathVariable Long id) {

6
ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/ProductMapper.xml
View File

@ -61,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectProductWithSkus" resultMap="ProductWithSkusResultMap">
SELECT
p.*,
pc.name AS productCategoryName,
s.id AS sku_id,
s.out_sku_id,
s.price as skuPrice,
@ -69,8 +70,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
s.sp_data
FROM
pms_product p
LEFT JOIN
pms_sku s ON p.id = s.product_id
LEFT JOIN pms_product_category pc ON p.category_id = pc.id
LEFT JOIN pms_sku s ON p.id = s.product_id
WHERE
p.id = #{id}
and p.del_flag = '0'
@ -101,6 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<resultMap id="ProductWithSkusResultMap" type="ProductVO">
<id property="id" column="id"/>
<result property="name" column="name"/>
<result property="productCategoryName" column="productCategoryName"/>
<collection property="skuList" ofType="SkuVO">
<id property="id" column="sku_id"/>
<result property="outSkuId" column="out_sku_id"/>

26
ruoyi-modules/ruoyi-im/src/main/java/com/wzj/soopin/im/controller/IMMessageController.java
View File

@ -3,6 +3,9 @@ package com.wzj.soopin.im.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.wzj.soopin.im.domain.SysMessage;
import com.wzj.soopin.im.domain.bo.SysMessageBo;
import com.wzj.soopin.im.domain.vo.SysMessageVo;
import com.wzj.soopin.im.service.ISysMessageService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.constraints.NotNull;
import lombok.RequiredArgsConstructor;
@ -11,19 +14,13 @@ import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.common.web.core.BaseController;
import com.wzj.soopin.im.domain.vo.SysMessageVo;
import com.wzj.soopin.im.service.ISysMessageService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
/**
* 消息管理
*
* @author ruoyi
*/
@Tag(name ="消息管理接口列表")
@Validated
@RestController
@RequiredArgsConstructor
@ -43,7 +40,7 @@ public class IMMessageController extends BaseController {
* 查询消息列表
*/
// @SaCheckPermission("system:message:list")
@Tag(name = "查询消息列表")
@Operation(summary = "查询消息列表")
@PostMapping("/page")
public R<Page<SysMessageVo>> list(@RequestBody SysMessageBo bo, Page page) {
Page<SysMessage> messagePage = messageService.page(page, bo.toWrapper());
@ -52,21 +49,16 @@ public class IMMessageController extends BaseController {
return R.ok(voPage);
}
/**
* 获取消息详细信息
*
* @param id 消息ID
*/
// @SaCheckPermission("system:message:query")
@Operation(summary = "获取消息详细信息")
@GetMapping("/{id}")
public R<SysMessageVo> getInfo(@NotNull(message = "消息ID不能为空") @PathVariable Long id) {
return R.ok(messageService.selectMessageById(id));
}
/**
* 发送消息
*/
@Operation(summary = "新增消息")
// @SaCheckPermission("system:message:send")
@Log(title = "消息管理", businessType = BusinessType.INSERT)
@RepeatSubmit()

43
ruoyi-modules/ruoyi-im/src/main/java/com/wzj/soopin/im/controller/IMMessageTemplateController.java
View File

@ -1,35 +1,30 @@
package com.wzj.soopin.im.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.wzj.soopin.im.converter.SysMessageTemplateConvert;
import com.wzj.soopin.im.domain.SysMessageTemplate;
import com.wzj.soopin.im.domain.bo.SysMessageTemplateBo;
import com.wzj.soopin.im.domain.vo.SysMessageTemplateVo;
import com.wzj.soopin.im.service.ISysMessageTemplateService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.web.core.BaseController;
import com.wzj.soopin.im.converter.SysMessageTemplateConvert;
import com.wzj.soopin.im.domain.SysMessageTemplate;
import com.wzj.soopin.im.domain.vo.SysMessageTemplateVo;
import com.wzj.soopin.im.service.ISysMessageTemplateService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 消息模板管理
*
* @author ruoyi
*/
@Tag(name = "消息模板管理")
@Validated
@RequiredArgsConstructor
@RestController
@ -44,19 +39,16 @@ public class IMMessageTemplateController extends BaseController {
* 查询消息模板列表
*/
// @SaCheckPermission("message:template:list")
@Tag(name = "查询消息模板列表")
@Operation(summary = "查询消息模板列表")
@PostMapping("/page")
public R<Page<SysMessageTemplateVo>> list(@RequestBody SysMessageTemplateBo bo, @RequestBody Page<SysMessageTemplate> page) {
Page<SysMessageTemplate> templatePage = templateService.page(page, bo.toWrapper());
return R.ok(convert.toVO(templatePage));
}
/**
* 获取消息模板详细信息
*
* @param id 消息模板ID
*/
// @SaCheckPermission("message:template:query")
@Operation(summary = "获取消息模板详细信息")
@GetMapping("/{id}")
public R<SysMessageTemplateVo> getInfo(@NotNull(message = "消息模板ID不能为空") @PathVariable Long id) {
SysMessageTemplate template = templateService.getById(id);
@ -79,10 +71,9 @@ public class IMMessageTemplateController extends BaseController {
return R.ok(templateService.selectTemplateListByName(searchName));
}
/**
* 新增消息模板
*/
// @SaCheckPermission("message:template:add")
@Operation(summary = "新增消息模板")
@Log(title = "消息模板管理", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping("/add")
@ -90,21 +81,17 @@ public class IMMessageTemplateController extends BaseController {
return R.ok(templateService.save(convert.toPo(bo)));
}
/**
* 修改消息模板
*/
// @SaCheckPermission("message:template:edit")
@Operation(summary = "修改消息模板")
@Log(title = "消息模板管理", businessType = BusinessType.UPDATE)
@PostMapping(("/update"))
public R<Boolean> edit(@Validated(EditGroup.class) @RequestBody SysMessageTemplateBo bo) {
return R.ok(templateService.updateById(convert.toPo(bo)));
}
/**
* 删除消息模板
*
* @param id 消息模板ID
*/
@Operation(summary = "删除消息模板")
// @SaCheckPermission("message:template:remove")
@Log(title = "消息模板管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{id}")

31
ruoyi-modules/ruoyi-im/src/main/java/com/wzj/soopin/im/controller/IMMessageUserController.java
View File

@ -3,6 +3,7 @@ package com.wzj.soopin.im.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.wzj.soopin.im.domain.SysMessage;
import com.wzj.soopin.im.service.ISysMessageService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
@ -20,11 +21,8 @@ import org.springframework.web.bind.annotation.*;
import static org.dromara.common.satoken.utils.LoginHelper.getUserId;
/**
* 消息管理
*
* @author ruoyi
*/
@Tag(name = "用户消息")
@Validated
@RestController
@RequiredArgsConstructor
@ -39,43 +37,34 @@ public class IMMessageUserController extends BaseController {
/**
* 获取未读消息列表
*/
// @SaCheckPermission("system:message:list")
@Tag(name = "查询未读消息列表")
@Operation(summary = "查询未读消息列表")
@PostMapping("/unread")
public R<Page<SysMessageVo>> unreadList(@RequestBody Page<SysMessage> page) {
Page<SysMessageVo> unreadPage = messageService.selectUnreadMessagesPage(getUserId(), page);
return R.ok(unreadPage);
}
/**
* 获取已读消息列表
*/
// @SaCheckPermission("system:message:list")
@Tag(name = "查询已读消息列表")
@Operation(summary = "查询已读消息列表")
@PostMapping("/read")
public R<Page<SysMessageVo>> readList(@RequestBody Page<SysMessage> page) {
Page<SysMessageVo> readPage = messageService.selectReadMessagesPage(getUserId(), page);
return R.ok(readPage);
}
/**
* 标记消息为已读
*/
// @SaCheckPermission("system:message:mark")
@Operation(summary = "标记消息为已读")
@Log(title = "消息管理", businessType = BusinessType.UPDATE)
@PutMapping("/mark/{id}")
public R<Void> markAsRead(@NotNull(message = "消息ID不能为空") @PathVariable Long id) {
return toAjax(messageService.markAsRead(id, getUserId()));
}
/**
* 删除消息
*
* @param ids 消息ID串
*/
@Operation(summary = "删除消息")
// @SaCheckPermission("system:message:remove")
@Log(title = "消息管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")

32
ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/FansController.java
View File

@ -1,3 +1,4 @@
package com.wzj.soopin.member.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@ -14,13 +15,13 @@ import com.wzj.soopin.member.domain.vo.MemberBlockVO;
import com.wzj.soopin.member.service.IFansService;
import com.wzj.soopin.member.service.IMemberBlockService;
import com.wzj.soopin.member.service.IMemberService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.domain.R;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.log.enums.BusinessType;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@ -42,7 +43,7 @@ public class FansController {
private final MemberBlockConvert memberblockconvert;
@Tag(name ="粉丝列表")
@Operation(summary ="粉丝列表")
@PostMapping("/fan/list")
public R<IPage<FansVO>> fansList(@RequestBody FansBO bo, @RequestBody Page page) {
LambdaQueryWrapper< Fans> fansQuery = new LambdaQueryWrapper<>();
@ -50,7 +51,8 @@ public class FansController {
Page<Fans> fans= service.page(page,fansQuery);
return R.ok(convert.toVO( fans));
}
@Tag(name ="关注列表")
@Operation(summary ="关注列表")
@PostMapping("/follow/list")
public R<IPage<FansVO>> followList(@RequestBody FansBO bo, @RequestBody Page page) {
LambdaQueryWrapper< Fans> fansQuery = new LambdaQueryWrapper<>();
@ -58,7 +60,8 @@ public class FansController {
Page<Fans> fans= service.page(page,fansQuery);
return R.ok(convert.toVO( fans));
}
@Tag(name ="朋友列表")
@Operation(summary ="朋友列表")
@PostMapping("/friend/list")
public R<IPage<FansVO>> friendList( @RequestBody FansBO bo, @RequestBody Page page) {
LambdaQueryWrapper< Fans> fansQuery = new LambdaQueryWrapper<>();
@ -69,14 +72,14 @@ public class FansController {
}
@Tag(name ="获取详细信息")
@Operation(summary ="获取详细信息")
@GetMapping(value = "/{id}")
public R<FansVO> getInfo(@PathVariable("id") Long id) {
return R.ok( convert.toVO(service.getById(id)));
}
@Tag(name ="删除粉丝信息")
@Operation(summary ="删除粉丝信息")
@Log(title = "意见反馈", businessType = BusinessType.DELETE)
@DeleteMapping("/{id}")
public R<Object> remove(@PathVariable Long id) {
@ -85,6 +88,7 @@ public class FansController {
@Operation(summary ="查询黑名单列表")
@GetMapping("block/list")
@MemberFillMethod
public R<List<MemberBlockVO>> queryBlockVloger(@RequestParam Long myId) {
@ -101,6 +105,7 @@ public class FansController {
* @param vloggerId
* @return
*/
@Operation(summary ="添加黑名单")
@PostMapping("block")
public R block(@RequestParam Long myId, @RequestParam Long vloggerId) {
// 判断两个id不能为空
@ -108,7 +113,7 @@ public class FansController {
return R.ok("id不能为空");
}
// 拉黑前只删除“我关注对方”的关系
// 拉黑前只删除"我关注对方"的关系
service.removeFansRelationship(myId, vloggerId);
//检查是否已在黑名单中
@ -121,18 +126,11 @@ public class FansController {
return R.ok();
}
@Operation(summary ="取消黑名单")
@PostMapping("cancelBlock")
public R cancelBlock(@RequestParam Long myId,
@RequestParam Long vloggerId) {
// 判断两个id不能为空
if (myId==null||vloggerId==null) {
R.fail("id不能为空");
}
memberBlockService.removeBlock(myId, vloggerId);
@RequestParam Long vloggerId) {
memberBlockService.removeBlock(myId, vloggerId);
return R.ok();
}
}

14
ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/FeedbackController.java
View File

@ -3,7 +3,6 @@ package com.wzj.soopin.member.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
//import com.wzj.soopin.content.service.VlogService;
import com.wzj.soopin.member.convert.FeedbackConvert;
import com.wzj.soopin.member.convert.MemberConvert;
import com.wzj.soopin.member.domain.bo.FeedbackBO;
@ -12,6 +11,7 @@ import com.wzj.soopin.member.domain.po.Member;
import com.wzj.soopin.member.domain.vo.FeedbackVO;
import com.wzj.soopin.member.service.IFeedbackService;
import com.wzj.soopin.member.service.IMemberService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.constant.CacheConstants;
@ -44,7 +44,7 @@ public class FeedbackController {
// private final VlogService vlogService;
@Tag(name = "查询意见反馈列表")
@Operation(summary = "查询意见反馈列表")
@PostMapping("/page")
public R<IPage<FeedbackVO>> list(@RequestBody FeedbackBO query, @RequestBody Page page) {
Page<Feedback> feedBackPage = service.page(page, query.toWrapper());
@ -93,27 +93,27 @@ public class FeedbackController {
}
@Tag(name = "修改意见反馈备注信息")
@Operation(summary = "修改意见反馈备注信息")
@Log(title = "意见反馈", businessType = BusinessType.UPDATE)
@PostMapping("/update")
public R editMark(@RequestBody FeedbackBO feedback) {
return R.ok(service.save(convert.toPo(feedback)));
}
@Tag(name = "修改意见反馈备注信息")
@Operation(summary = "新增意见反馈")
@Log(title = "新增意见反馈", businessType = BusinessType.UPDATE)
@PostMapping("/add")
public R add(@RequestBody FeedbackBO feedback) {
return R.ok(service.save(convert.toPo(feedback)));
}
@Tag(name = "获取详细信息")
@Operation(summary = "获取详细信息")
@GetMapping(value = "/{id}")
public R<FeedbackVO> getInfo(@PathVariable("id") Long id) {
return R.ok(service.selectById(id));
}
@Tag(name = ("处理"))
@Operation(summary = "处理意见反馈")
@Log(title = "意见反馈", businessType = BusinessType.UPDATE)
@PostMapping("/handle")
public R changeStatus(@RequestBody FeedbackBO bo) {
@ -122,7 +122,7 @@ public class FeedbackController {
}
@Tag(name = "删除意见反馈")
@Operation(summary = "删除意见反馈")
@Log(title = "意见反馈", businessType = BusinessType.DELETE)
@DeleteMapping("/{id}")
public R<Object> remove(@PathVariable Long id) {

19
ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberAccountController.java
View File

@ -7,6 +7,7 @@ import com.wzj.soopin.member.domain.bo.MemberAccountBO;
import com.wzj.soopin.member.domain.po.MemberAccount;
import com.wzj.soopin.member.domain.vo.MemberAccountVO;
import com.wzj.soopin.member.service.IMemberAccountService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R;
@ -16,22 +17,23 @@ import org.dromara.common.log.enums.BusinessType;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 会员账户表Controller
*
* @author zcc
* @date 2024-03-01
*/
@Tag(name ="会员账户表接口列表")
@Tag(name = "会员账户表接口列表")
@RestController
@RequestMapping("/ums/member/account")
@RequiredArgsConstructor
public class MemberAccountController {
public class MemberAccountController {
private final IMemberAccountService service;
private final MemberAccountConvert convert;
@Tag(name ="查询会员账户表列表")
@Operation(summary = "查询会员账户表列表")
@PostMapping("/list")
public R<IPage<MemberAccountVO>> list(@RequestBody MemberAccountBO bo,
@RequestParam(defaultValue = "1") int pageNum,
@ -41,7 +43,7 @@ public class MemberAccountController {
return R.ok(result);
}
@Tag(name ="导出会员账户表列表")
@Operation(summary = "导出会员账户表列表")
@Log(title = "会员账户表", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public R<String> export(MemberAccountBO query) {
@ -50,28 +52,27 @@ public class MemberAccountController {
return R.ok(util.writeExcel(convert.toVO(list), "会员账户表数据"));
}
@Tag(name ="获取会员账户表详细信息")
@Operation(summary = "获取会员账户表详细信息")
@GetMapping(value = "/{id}")
public R<MemberAccountVO> getInfo(@PathVariable("id") Long id) {
return R.ok(convert.toVO(service.getById(id)));
}
@Tag(name ="新增会员账户表")
@Operation(summary = "新增会员账户表")
@Log(title = "会员账户表", businessType = BusinessType.INSERT)
@PostMapping("/add")
public R<Object> add(@RequestBody MemberAccountBO memberAccount) {
return R.ok(service.save(convert.toPo(memberAccount)));
}
@Tag(name ="修改会员账户表")
@Operation(summary = "修改会员账户表")
@Log(title = "会员账户表", businessType = BusinessType.UPDATE)
@PutMapping("/update")
public R<Object> edit(@RequestBody MemberAccountBO memberAccount) {
return R.ok(service.updateById(convert.toPo(memberAccount)));
}
@Tag(name ="删除会员账户表")
@Operation(summary = "删除会员账户表")
@Log(title = "会员账户表", businessType = BusinessType.DELETE)
@DeleteMapping("/{memberId}")
public R<Object> remove(@PathVariable Long memberId) {

15
ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberAddressController.java
View File

@ -8,6 +8,7 @@ import com.wzj.soopin.member.domain.bo.MemberAddressBO;
import com.wzj.soopin.member.domain.po.MemberAddress;
import com.wzj.soopin.member.domain.vo.MemberAddressVO;
import com.wzj.soopin.member.service.IMemberAddressService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R;
@ -24,7 +25,7 @@ import java.util.List;
* @author zcc
* @date 2022-11-28
*/
@Tag(name ="会员收货地址接口列表")
@Tag(name = "会员收货地址接口列表")
@RestController
@RequestMapping("/ums/member/address")
@RequiredArgsConstructor
@ -36,7 +37,7 @@ public class MemberAddressController {
@Tag(name ="查询会员收货地址列表")
@Operation(summary = "查询会员收货地址列表")
@PostMapping("/list")
@MemberFillMethod
public R list(@RequestBody MemberAddressBO query,@RequestBody Page<MemberAddress> page) {
@ -44,7 +45,7 @@ public class MemberAddressController {
return R.ok(convert.toVO(list));
}
@Tag(name ="导出会员收货地址列表")
@Operation(summary = "导出会员收货地址列表")
@Log(title = "会员收货地址", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public R<String> export(MemberAddressBO query) {
@ -53,20 +54,20 @@ public class MemberAddressController {
return R.ok(util.writeExcel(convert.toVO(list), "会员收货地址数据"));
}
@Tag(name ="获取会员收货地址详细信息")
@Operation(summary = "获取会员收货地址详细信息")
@GetMapping(value = "/{id}")
public R<MemberAddressVO> getInfo(@PathVariable("id") Long id) {
return R.ok(convert.toVO(service.getById(id)));
}
@Tag(name ="新增会员收货地址")
@Operation(summary = "新增会员收货地址")
@Log(title = "会员收货地址", businessType = BusinessType.INSERT)
@PostMapping("/add")
public R<Object> add(@RequestBody MemberAddressBO memberAddress) {
return R.ok(service.save(convert.toPo(memberAddress)));
}
@Tag(name ="修改会员收货地址")
@Operation(summary = "修改会员收货地址")
@Log(title = "会员收货地址", businessType = BusinessType.UPDATE)
@PostMapping("/update")
public R edit(@RequestBody MemberAddressBO memberAddress) {
@ -74,7 +75,7 @@ public class MemberAddressController {
return R.ok(null);
}
@Tag(name ="删除会员收货地址")
@Operation(summary = "删除会员收货地址")
@Log(title = "会员收货地址", businessType = BusinessType.DELETE)
@DeleteMapping("/{id}")
public R<Object> remove(@PathVariable Long id) {

17
ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberBankController.java
View File

@ -7,6 +7,7 @@ import com.wzj.soopin.member.domain.bo.MemberBankBO;
import com.wzj.soopin.member.domain.po.MemberBank;
import com.wzj.soopin.member.domain.vo.MemberBankVO;
import com.wzj.soopin.member.service.IMemberBankService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R;
@ -26,28 +27,28 @@ public class MemberBankController {
private final IMemberBankService service;
private final MemberBankConvert convert;
@Tag(name = "查询 列表")
@Operation(summary = "查询银行卡列表")
@PostMapping("/list")
public R<IPage<MemberBankVO>> list(@RequestBody MemberBankBO bo, @RequestBody Page page) {
Page<MemberBank> pages = service.page(page, bo.toWrapper());
return R.ok(convert.toVO(pages));
}
@Tag(name = "新增")
@Log(title = "新增 ", businessType = BusinessType.INSERT)
@Operation(summary = "新增银行卡")
@Log(title = "新增银行卡", businessType = BusinessType.INSERT)
@PostMapping("/add")
public R add(@RequestBody MemberBankBO bo) {
return R.ok(service.save(convert.toPo(bo)));
}
@Tag(name = "详情")
@Operation(summary = "获取银行卡详情")
@GetMapping(value = "/{id}")
public R<MemberBankVO> getInfo(@PathVariable("id") Long id) {
return R.ok(convert.toVO(service.getById(id)));
}
@Tag(name = ("处理"))
@Log(title = "修改", businessType = BusinessType.UPDATE)
@Operation(summary = "修改银行卡")
@Log(title = "修改银行卡", businessType = BusinessType.UPDATE)
@PostMapping("/update")
public R update(@RequestBody MemberBankBO bo) {
service.save(convert.toPo(bo));
@ -55,8 +56,8 @@ public class MemberBankController {
}
@Tag(name = "删除")
@Log(title = "删除", businessType = BusinessType.DELETE)
@Operation(summary = "删除银行卡")
@Log(title = "删除银行卡", businessType = BusinessType.DELETE)
@DeleteMapping("/{id}")
public R<Object> remove(@PathVariable Long id) {
return R.ok(service.removeById(id));

14
ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberCartController.java
View File

@ -1,3 +1,4 @@
package com.wzj.soopin.member.controller;
@ -9,6 +10,7 @@ import com.wzj.soopin.member.domain.bo.MemberCartBO;
import com.wzj.soopin.member.domain.po.MemberCart;
import com.wzj.soopin.member.domain.vo.MemberCartVO;
import com.wzj.soopin.member.service.IMemberCartService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.dromara.common.core.domain.R;
import org.dromara.common.log.annotation.Log;
@ -32,7 +34,7 @@ public class MemberCartController extends BaseController {
@Autowired
private MemberCartConvert convert;
@Tag(name = "查询购物车列表")
@Operation(summary = "查询购物车列表")
@PostMapping("/list")
@MemberFillMethod
public R<IPage<MemberCartVO>> list(@RequestBody MemberCartBO bo, @RequestBody Page page) {
@ -40,7 +42,7 @@ public class MemberCartController extends BaseController {
return R.ok(convert.toVO(userPage));
}
@Tag(name = "导出购物车列表")
@Operation(summary = "导出购物车列表")
@Log(title = "购物车", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public R<String> export() {
@ -50,28 +52,28 @@ public class MemberCartController extends BaseController {
return null;
}
@Tag(name = "获取购物车详细信息")
@Operation(summary = "获取购物车详细信息")
@GetMapping(value = "/{id}")
@MemberFillMethod
public R<MemberCartVO> getInfo(@PathVariable("id") Long id) {
return R.ok(convert.toVO(service.getById(id)));
}
@Tag(name = "新增购物车")
@Operation(summary = "新增购物车")
@Log(title = "购物车", businessType = BusinessType.INSERT)
@PostMapping("/add")
public R add(@RequestBody MemberCartBO memberCart) {
return R.ok(service.save(convert.toPo(memberCart)));
}
@Tag(name = "修改购物车")
@Operation(summary = "修改购物车")
@Log(title = "购物车", businessType = BusinessType.UPDATE)
@PostMapping("/update")
public R edit(@RequestBody MemberCartBO memberCart) {
return R.ok(service.updateById(convert.toPo(memberCart)));
}
@Tag(name = "删除购物车")
@Operation(summary = "删除购物车")
@Log(title = "购物车", businessType = BusinessType.DELETE)
@DeleteMapping("/{id}")
public R remove(@PathVariable Long id) {

18
ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberForbiddenController.java
View File

@ -1,3 +1,4 @@
package com.wzj.soopin.member.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
@ -7,6 +8,7 @@ import com.wzj.soopin.member.domain.bo.MemberForbiddenBO;
import com.wzj.soopin.member.domain.po.MemberForbidden;
import com.wzj.soopin.member.domain.vo.MemberForbiddenVO;
import com.wzj.soopin.member.service.IMemberForbiddenService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R;
@ -26,28 +28,28 @@ public class MemberForbiddenController {
private final IMemberForbiddenService service;
private final MemberForbiddenConvert convert;
@Tag(name = "查询列表")
@Operation(summary = "查询用户封禁列表")
@PostMapping("/list")
public R<IPage<MemberForbiddenVO>> list(@RequestBody MemberForbiddenBO bo, @RequestBody Page page) {
Page<MemberForbidden> pages = service.page(page, bo.toWrapper());
return R.ok(convert.toVO(pages));
}
@Tag(name = "新增")
@Log(title = "新增 ", businessType = BusinessType.INSERT)
@Operation(summary = "新增用户封禁")
@Log(title = "新增用户封禁", businessType = BusinessType.INSERT)
@PostMapping("/add")
public R add(@RequestBody MemberForbiddenBO bo) {
return R.ok(service.save(convert.toPo(bo)));
}
@Tag(name = "详情")
@Operation(summary = "获取用户封禁详情")
@GetMapping(value = "/{id}")
public R<MemberForbiddenVO> getInfo(@PathVariable("id") Long id) {
return R.ok(convert.toVO(service.getById(id)));
}
@Tag(name = ("处理"))
@Log(title = "修改", businessType = BusinessType.UPDATE)
@Operation(summary = "修改用户封禁")
@Log(title = "修改用户封禁", businessType = BusinessType.UPDATE)
@PostMapping("/update")
public R update(@RequestBody MemberForbiddenBO bo) {
service.save(convert.toPo(bo));
@ -55,8 +57,8 @@ public class MemberForbiddenController {
}
@Tag(name = "删除")
@Log(title = "删除", businessType = BusinessType.DELETE)
@Operation(summary = "删除用户封禁")
@Log(title = "删除用户封禁", businessType = BusinessType.DELETE)
@DeleteMapping("/{id}")
public R<Object> remove(@PathVariable Long id) {
return R.ok(service.removeById(id));

26
ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/MemberLoginInfoController.java
View File

@ -1,3 +1,4 @@
package com.wzj.soopin.member.controller;
@ -8,6 +9,7 @@ import com.wzj.soopin.member.domain.bo.MemberLoginInfoBO;
import com.wzj.soopin.member.domain.po.MemberLoginInfo;
import com.wzj.soopin.member.domain.vo.MemberLoginInfoVO;
import com.wzj.soopin.member.service.IMemberLoginInfoService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R;
@ -25,7 +27,7 @@ import java.util.List;
* @author zcc
* @date 2023-07-26
*/
@Tag(name ="会员登录记录接口列表")
@Tag(name = "会员登录记录接口列表")
@RestController
@RequestMapping("/ums/member/loginInfo/")
@RequiredArgsConstructor
@ -33,7 +35,7 @@ public class MemberLoginInfoController extends BaseController {
private final IMemberLoginInfoService service;
private final MemberLoginInfoConvert convert;
@Tag(name ="查询会员登录记录列表")
@Operation(summary = "查询会员登录记录列表")
@SaCheckPermission("ums:memberlogininfo:list")
@PostMapping("list")
public R<Page<MemberLoginInfoVO>> list(@RequestBody MemberLoginInfoBO query, @RequestBody Page page) {
@ -41,7 +43,7 @@ public class MemberLoginInfoController extends BaseController {
return R.ok(convert.toVO(list));
}
@Tag(name ="导出会员登录记录列表")
@Operation(summary = "导出会员登录记录列表")
@SaCheckPermission("ums:memberlogininfo:export")
@Log(title = "会员登录记录", businessType = BusinessType.EXPORT)
@PostMapping("export")
@ -52,34 +54,34 @@ public class MemberLoginInfoController extends BaseController {
}
@Tag(name ="导出会员登录记录列表")
@SaCheckPermission("ums:memberlogininfo:export")
@Log(title = "会员登录记录", businessType = BusinessType.EXPORT)
@Operation(summary = "新增会员登录记录")
@SaCheckPermission("ums:memberlogininfo:insert")
@Log(title = "会员登录记录", businessType = BusinessType.INSERT)
@PostMapping("add")
public R<Boolean> add(@RequestBody MemberLoginInfoBO bo) {
return R.ok(service.save(convert.toPo(bo)));
}
@Tag(name ="获取会员登录记录详细信息")
@Operation(summary = "获取会员登录记录详细信息")
@SaCheckPermission("ums:memberlogininfo:query")
@GetMapping(value = "{id}")
public R<MemberLoginInfoVO> getInfo(@PathVariable("id") Long id) {
return R.ok(convert.toVO(service.getById(id)));
}
@Tag(name ="修改会员登录记录")
@Operation(summary = "修改会员登录记录")
@SaCheckPermission("ums:memberlogininfo:edit")
@Log(title = "会员登录记录", businessType = BusinessType.UPDATE)
@PostMapping("/update")
public R edit(@RequestBody MemberLoginInfoBO memberLoginInfo) {
public R edit(@RequestBody MemberLoginInfoBO memberLoginInfo) {
return R.ok(service.updateById(convert.toPo(memberLoginInfo)));
}
@Tag(name ="删除会员登录记录")
@Operation(summary = "删除会员登录记录")
@SaCheckPermission("ums:memberlogininfo:remove")
@Log(title = "会员登录记录", businessType = BusinessType.DELETE)
@DeleteMapping("{id}")
public R remove(@PathVariable Long id) {
@DeleteMapping("{id}")
public R remove(@PathVariable Long id) {
return R.ok(service.removeById(id));
}
}

22
ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/controller/TenantForbiddenController.java
View File

@ -1,3 +1,4 @@
package com.wzj.soopin.member.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
@ -7,6 +8,7 @@ import com.wzj.soopin.member.domain.bo.TenantForbiddenBO;
import com.wzj.soopin.member.domain.po.TenantForbidden;
import com.wzj.soopin.member.domain.vo.TenantForbiddenVO;
import com.wzj.soopin.member.service.ITenantForbiddenService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R;
@ -15,9 +17,9 @@ import org.dromara.common.log.enums.BusinessType;
import org.springframework.web.bind.annotation.*;
/**
* 用户封禁
* 租户封禁
*/
@Tag(name = "用户封禁")
@Tag(name = "租户封禁")
@RestController
@RequestMapping("/system/tenant/forbidden")
@RequiredArgsConstructor
@ -26,28 +28,28 @@ public class TenantForbiddenController {
private final ITenantForbiddenService service;
private final TenantForbiddenConvert convert;
@Tag(name = "查询列表")
@Operation(summary = "查询列表")
@PostMapping("/list")
public R<IPage<TenantForbiddenVO>> list(@RequestBody TenantForbiddenBO bo, @RequestBody Page page) {
Page<TenantForbidden> pages = service.page(page, bo.toWrapper());
return R.ok(convert.toVO(pages));
}
@Tag(name = "新增")
@Log(title = "新增 ", businessType = BusinessType.INSERT)
@Operation(summary = "新增封禁")
@Log(title = "新增封禁", businessType = BusinessType.INSERT)
@PostMapping("/add")
public R add(@RequestBody TenantForbiddenBO bo) {
return R.ok(service.save(convert.toPo(bo)));
}
@Tag(name = "详情")
@Operation(summary = "获取封禁详情")
@GetMapping(value = "/{id}")
public R<TenantForbiddenVO> getInfo(@PathVariable("id") Long id) {
return R.ok(convert.toVO(service.getById(id)));
}
@Tag(name = ("处理"))
@Log(title = "修改", businessType = BusinessType.UPDATE)
@Operation(summary = "修改封禁")
@Log(title = "修改封禁", businessType = BusinessType.UPDATE)
@PostMapping("/update")
public R update(@RequestBody TenantForbiddenBO bo) {
service.save(convert.toPo(bo));
@ -55,8 +57,8 @@ public class TenantForbiddenController {
}
@Tag(name = "删除")
@Log(title = "删除", businessType = BusinessType.DELETE)
@Operation(summary = "删除封禁")
@Log(title = "删除封禁", businessType = BusinessType.DELETE)
@DeleteMapping("/{id}")
public R<Object> remove(@PathVariable Long id) {
return R.ok(service.removeById(id));

24
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/AftersaleController.java
View File

@ -1,3 +1,4 @@
package com.wzj.soopin.order.controller;
@ -9,6 +10,7 @@ import com.wzj.soopin.order.domain.entity.Aftersale;
import com.wzj.soopin.order.domain.form.DealWithAftersaleForm;
import com.wzj.soopin.order.domain.vo.*;
import com.wzj.soopin.order.service.impl.AftersaleServiceImpl;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@ -32,7 +34,7 @@ import java.util.List;
* @author zcc
* @date 2022-12-29
*/
@Tag(name ="订单售后接口列表")
@Tag(name = "订单售后")
@RestController
@RequestMapping("/oms/aftersale")
@Slf4j
@ -44,14 +46,14 @@ public class AftersaleController extends BaseController {
private final RedisService redisService;
@Tag(name ="查询订单售后列表")
@Operation(summary = "查询订单售后列表")
@PostMapping("/list")
public R<IPage<AftersaleVO>> list(@RequestBody AftersaleBo query, Page<Aftersale> page) {
return R.ok(service.getlist(page,query));
}
@Tag(name ="导出订单售后列表")
@Operation(summary = "导出订单售后列表")
@Log(title = "订单售后", businessType = BusinessType.EXPORT)
@PostMapping("export")
public R<String> export(AftersaleBo query) {
@ -60,13 +62,13 @@ public class AftersaleController extends BaseController {
return R.ok(util.writeExcel(convert.toVO(list), "订单售后数据"));
}
@Tag(name ="获取订单售后详细信息")
@Operation(summary = "获取订单售后详细信息")
@GetMapping(value = "/{id}")
public ResponseEntity<ManagerRefundOrderDetailVO> getInfo(@PathVariable("id") Long orderId) {
return ResponseEntity.ok(service.selectById(orderId));
}
@Tag(name ="新增订单售后")
@Operation(summary = "新增订单售后")
@Log(title = "订单售后", businessType = BusinessType.INSERT)
@PostMapping("/add")
public R add(@RequestBody Aftersale aftersale) {
@ -75,14 +77,14 @@ public class AftersaleController extends BaseController {
return R.ok(service.save(aftersale));
}
@Tag(name ="修改订单售后")
@Operation(summary = "修改订单售后")
@Log(title = "订单售后", businessType = BusinessType.UPDATE)
@PostMapping("/update")
public R edit(@RequestBody Aftersale aftersale) {
return R.ok(service.updateById(aftersale));
return R.ok(service.updateById(aftersale));
}
@Tag(name = "删除订单售后")
@Operation(summary = "删除订单售后")
@Log(title = "订单售后", businessType = BusinessType.DELETE)
@DeleteMapping("/{id}")
public R remove(@PathVariable Long id) {
@ -90,7 +92,7 @@ public class AftersaleController extends BaseController {
}
@Tag(name ="售后订单操作")
@Operation(summary = "售后订单操作")
@PostMapping("/dealWith")
public ResponseEntity<Boolean> updateStatus(@RequestBody DealWithAftersaleForm request){
LoginUser user = SecurityUtils.getLoginUser();
@ -112,13 +114,13 @@ public class AftersaleController extends BaseController {
}
}
@Tag(name ="查看日志")
@Operation(summary = "查看售后日志")
@GetMapping("/log/{orderId}")
public R log(@PathVariable Long orderId){
return R.ok(service.log(orderId));
}
@Tag(name ="退款审批")
@Operation(summary = "退款审批")
@Log(title = "退款审批", businessType = BusinessType.UPDATE)
@GetMapping("/audit")
public R audit( @RequestParam Long id,

19
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/AftersaleItemController.java
View File

@ -1,3 +1,4 @@
package com.wzj.soopin.order.controller;
@ -8,6 +9,7 @@ import com.wzj.soopin.order.domain.entity.AftersaleItem;
import com.wzj.soopin.order.domain.vo.AftersaleItemVO;
import com.wzj.soopin.order.service.AftersaleItemService;
import com.wzj.soopin.order.service.impl.AftersaleItemServiceImpl;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R;
@ -19,13 +21,14 @@ import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 订单售后Controller
*
* @author zcc
* @date 2022-12-29
*/
@Tag(name ="订单售后接口列表")
@Tag(name = "订单售后接口列表")
@RestController
@RequestMapping("/oms/aftersaleItem")
@RequiredArgsConstructor
@ -35,14 +38,14 @@ public class AftersaleItemController extends BaseController {
private final AftersaleItemConvert convert;
private final AftersaleItemService aftersaleItemService;
@Tag(name ="查询订单售后列表")
@Operation(summary = "查询订单售后列表")
@PostMapping("/list")
public R<Page<AftersaleItemVO>> list(@RequestBody AftersaleItemBo query, Page<AftersaleItem> page) {
Page<AftersaleItem> list = aftersaleItemService.page(page,query.toWrapper() );
return R.ok(convert.toVO(list));
}
@Tag(name ="导出订单售后列表")
@Operation(summary = "导出订单售后列表")
@Log(title = "订单售后", businessType = BusinessType.EXPORT)
@PostMapping("export")
public R<String> export(AftersaleItemBo query) {
@ -51,13 +54,13 @@ public class AftersaleItemController extends BaseController {
return R.ok(util.writeExcel(convert.toVO(list), "订单售后数据"));
}
@Tag(name ="获取订单售后详细信息")
@Operation(summary = "获取订单售后详细信息")
@GetMapping(value = "/{id}")
public ResponseEntity<AftersaleItem> getInfo(@PathVariable("id") Long id) {
return ResponseEntity.ok(service.getById(id));
}
@Tag(name ="新增订单售后")
@Operation(summary = "新增订单售后")
@Log(title = "订单售后", businessType = BusinessType.INSERT)
@PostMapping("/add")
public R add(@RequestBody AftersaleItemBo aftersaleItem) {
@ -65,7 +68,7 @@ public class AftersaleItemController extends BaseController {
}
@Tag(name ="修改订单售后")
@Operation(summary = "修改订单售后")
@Log(title = "订单售后", businessType = BusinessType.UPDATE)
@PostMapping("/update")
public R edit(@RequestBody AftersaleItem aftersaleItem) {
@ -73,9 +76,9 @@ public class AftersaleItemController extends BaseController {
}
@Tag(name ="删除订单售后")
@Operation(summary = "删除订单售后")
@Log(title = "订单售后", businessType = BusinessType.DELETE)
@DeleteMapping("/{id}")
@DeleteMapping("/{id}")
public R remove(@PathVariable Long id) {
return R.ok(service.removeById(id));
}

19
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/OrderDeliveryHistoryController.java
View File

@ -1,3 +1,4 @@
package com.wzj.soopin.order.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
@ -8,6 +9,7 @@ import com.wzj.soopin.order.domain.entity.OrderDeliveryHistory;
import com.wzj.soopin.order.domain.vo.OrderDeliveryHistoryVO;
import com.wzj.soopin.order.service.OrderDeliveryHistoryService;
import com.wzj.soopin.order.service.impl.OrderDeliveryHistoryServiceImpl;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R;
@ -18,13 +20,14 @@ import org.dromara.common.web.core.BaseController;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 订单发货记录Controller
*
* @author zcc
* @date 2022-12-01
*/
@Tag(name ="订单发货记录接口列表")
@Tag(name = "订单发货记录")
@RestController
@RequestMapping("/oms/orderDeliveryHistory")
@RequiredArgsConstructor
@ -34,14 +37,14 @@ public class OrderDeliveryHistoryController extends BaseController {
private final OrderDeliveryHistoryConvert convert;
private final OrderDeliveryHistoryService historyService;
@Tag(name ="查询订单发货列表")
@Operation(summary = "查询订单发货列表")
@PostMapping("/list")
public R<IPage<OrderDeliveryHistoryVO>> list(@RequestBody OrderDeliveryHistoryBo query, Page<OrderDeliveryHistory> page) {
Page<OrderDeliveryHistory> list = historyService.page(page,query.toWrapper() );
return R.ok(convert.toVO(list));
}
@Tag(name ="导出订单发货记录列表")
@Operation(summary = "导出订单发货记录列表")
@Log(title = "订单发货记录", businessType = BusinessType.EXPORT)
@PostMapping("export")
public R<String> export(OrderDeliveryHistoryBo query) {
@ -51,30 +54,30 @@ public class OrderDeliveryHistoryController extends BaseController {
}
@Tag(name ="获取订单发货记录详细信息")
@Operation(summary = "获取订单发货记录详细信息")
@GetMapping(value = "/{id}")
public R<OrderDeliveryHistory> getInfo(@PathVariable("id") Long id) {
return R.ok(service.getById(id));
}
@Tag(name ="新增订单发货记录")
@Operation(summary = "新增订单发货记录")
@Log(title = "订单发货记录", businessType = BusinessType.INSERT)
@PostMapping("/add")
public R add(@RequestBody OrderDeliveryHistory orderDeliveryHistory) {
return R.ok(service.save(orderDeliveryHistory));
}
@Tag(name ="修改订单发货记录")
@Operation(summary = "修改订单发货记录")
@Log(title = "订单发货记录", businessType = BusinessType.UPDATE)
@PostMapping("/update")
public R edit(@RequestBody OrderDeliveryHistory orderDeliveryHistory) {
return R.ok(service.updateById(orderDeliveryHistory));
}
@Tag(name ="删除订单发货记录")
@Operation(summary = "删除订单发货记录")
@Log(title = "订单发货记录", businessType = BusinessType.DELETE)
@DeleteMapping("/{id}")
@DeleteMapping("/{id}")
public R remove(@PathVariable Long id) {
return R.ok(service.removeById(id));
}

23
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/OrderItemController.java
View File

@ -1,3 +1,4 @@
package com.wzj.soopin.order.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
@ -8,6 +9,7 @@ import com.wzj.soopin.order.domain.entity.OrderItem;
import com.wzj.soopin.order.domain.vo.OrderItemVO;
import com.wzj.soopin.order.service.OrderItemService;
import com.wzj.soopin.order.service.impl.OrderItemServiceImpl;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R;
@ -18,13 +20,14 @@ import org.dromara.common.web.core.BaseController;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 订单中所包含的商品Controller
*
* @author zcc
* @date 2022-12-01
*/
@Tag(name ="订单中所包含的商品接口列表")
@Tag(name = "订单中所包含的商品")
@RestController
@RequestMapping("/oms/orderItem")
@RequiredArgsConstructor
@ -35,15 +38,15 @@ public class OrderItemController extends BaseController {
private final OrderItemConvert convert;
private final OrderItemService orderItemService;
@Tag(name = "查询订单中所包含的商品列表")
@Operation(summary = "查询订单中所包含的商品列表")
@PostMapping("/list")
public R<IPage<OrderItemVO>> list(@RequestBody OrderItemBo query, Page<OrderItem> page) {
Page<OrderItem> list = orderItemService.page(page,query.toWrapper() );
return R.ok(convert.toVO(list));
}
@Tag(name ="导出会员信息列表")
@Log(title = "会员信息", businessType = BusinessType.EXPORT)
@Operation(summary = "导出订单商品列表")
@Log(title = "订单商品", businessType = BusinessType.EXPORT)
@PostMapping("export")
public R<String> export(OrderItemBo query) {
List<OrderItem> list = service.list(query.toWrapper());
@ -51,29 +54,29 @@ public class OrderItemController extends BaseController {
return R.ok(util.writeExcel(convert.toVO(list), "订单中所包含的商品数据"));
}
@Tag(name = "获取订单中所包含的商品详细信息")
@Operation(summary = "获取订单中所包含的商品详细信息")
@GetMapping(value = "/{id}")
public R getInfo(@PathVariable("id") Long id) {
return R.ok(service.getById(id));
}
@Tag(name = "新增订单中所包含的商品")
@Operation(summary = "新增订单中所包含的商品")
@Log(title = "订单中所包含的商品", businessType = BusinessType.INSERT)
@PostMapping("/add")
public R add(@RequestBody OrderItem orderItem) {
return R.ok(service.save(orderItem));
}
@Tag(name = "修改订单中所包含的商品")
@Operation(summary = "修改订单中所包含的商品")
@Log(title = "订单中所包含的商品", businessType = BusinessType.UPDATE)
@PostMapping("/update")
public R edit(@RequestBody OrderItem orderItem) {
return R.ok(service.updateById(orderItem));
return R.ok(service.updateById(orderItem));
}
@Tag(name = "删除订单中所包含的商品")
@Operation(summary = "删除订单中所包含的商品")
@Log(title = "订单中所包含的商品", businessType = BusinessType.DELETE)
@DeleteMapping("/{id}")
@DeleteMapping("/{id}")
public R remove(@PathVariable Long id) {
return R.ok(service.removeById(id));
}

23
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/OrderOperateHistoryController.java
View File

@ -1,3 +1,4 @@
package com.wzj.soopin.order.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
@ -7,6 +8,7 @@ import com.wzj.soopin.order.domain.bo.OrderOperateHistoryBo;
import com.wzj.soopin.order.domain.entity.OrderOperateHistory;
import com.wzj.soopin.order.domain.vo.OrderOperateHistoryVO;
import com.wzj.soopin.order.service.impl.OrderOperateHistoryServiceImpl;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R;
@ -17,13 +19,14 @@ import org.dromara.common.web.core.BaseController;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 订单操作历史记录Controller
* 订单操作历史记录
*
* @author zcc
* @date 2022-12-01
*/
@Tag(name ="订单操作历史记录接口列表")
@Tag(name = "订单操作历史记录")
@RestController
@RequestMapping("/oms/orderOperateHistory")
@RequiredArgsConstructor
@ -33,7 +36,7 @@ public class OrderOperateHistoryController extends BaseController {
private final OrderOperateHistoryServiceImpl service;
private final OrderOperateHistoryConvert convert;
@Tag(name ="查询订单操作历史记录列表")
@Operation(summary = "查询订单操作历史记录列表")
@PostMapping("/list")
public R<IPage<OrderOperateHistoryVO>> list(@RequestBody OrderOperateHistoryBo query, Page<OrderOperateHistory> page) {
Page<OrderOperateHistory> list = service.page(page,query.toWrapper() );
@ -41,7 +44,7 @@ public class OrderOperateHistoryController extends BaseController {
}
@Tag(name ="导出订单操作历史记录列表")
@Operation(summary = "导出订单操作历史记录列表")
@Log(title = "订单操作历史记录", businessType = BusinessType.EXPORT)
@PostMapping("export")
public R<String> export(OrderOperateHistoryBo query) {
@ -50,30 +53,30 @@ public class OrderOperateHistoryController extends BaseController {
return R.ok(util.writeExcel(convert.toVO(list), "订单操作历史记录数据"));
}
@Tag(name ="获取订单操作历史记录详细信息")
@Operation(summary = "获取订单操作历史记录详细信息")
@GetMapping(value = "/{id}")
public R getInfo(@PathVariable("id") Long id) {
return R.ok(service.getById(id));
}
@Tag(name ="新增订单操作历史记录")
@Operation(summary = "新增订单操作历史记录")
@Log(title = "订单操作历史记录", businessType = BusinessType.INSERT)
@PostMapping("/add")
public R add(@RequestBody OrderOperateHistory orderOperateHistory) {
return R.ok(service.save(orderOperateHistory));
}
@Tag(name ="修改订单操作历史记录")
@Operation(summary = "修改订单操作历史记录")
@Log(title = "订单操作历史记录", businessType = BusinessType.UPDATE)
@PostMapping("/update")
public R edit(@RequestBody OrderOperateHistory orderOperateHistory) {
return R.ok(service.updateById(orderOperateHistory));
}
@Tag(name ="删除订单操作历史记录")
@Operation(summary = "删除订单操作历史记录")
@Log(title = "订单操作历史记录", businessType = BusinessType.DELETE)
@DeleteMapping("/{id}")
@DeleteMapping("/{id}")
public R remove(@PathVariable Long id) {
return R.ok(service.removeById(id));
return R.ok(service.removeById(id));
}
}

13
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/RedPacketController.java
View File

@ -1,10 +1,11 @@
package com.wzj.soopin.order.controller;
import com.wzj.soopin.order.domain.query.GrabRedPacketRequest;
import com.wzj.soopin.order.domain.query.SendRedPacketRequest;
import com.wzj.soopin.order.service.RedPacketService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.dromara.common.core.domain.R;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -16,7 +17,7 @@ import java.util.Map;
*/
@RestController
@RequestMapping("/api/packet")
@Api(tags = "红包功能接口")
@Tag(name = "红包功能接口")
public class RedPacketController {
@Autowired
@ -28,7 +29,7 @@ public class RedPacketController {
* @return 红包创建结果
*/
@PostMapping("/send")
@ApiOperation("发红包")
@Operation(summary = "发红包")
public R<Map<String, Object>> sendRedPacket(@RequestBody SendRedPacketRequest request) {
Map<String, Object> result = redPacketService.sendRedPacket(request);
return R.ok("红包发送成功", result);
@ -39,7 +40,7 @@ public class RedPacketController {
* @return 抢红包结果
*/
@PostMapping("/grab")
@ApiOperation("抢红包")
@Operation(summary = "抢红包")
public R<Map<String, Object>> grabRedPacket(@RequestBody GrabRedPacketRequest request) {
Map<String, Object> result = redPacketService.grabRedPacket(request);
return R.ok("红包领取成功", result);
@ -51,7 +52,7 @@ public class RedPacketController {
// * @return 红包详情
// */
// @GetMapping("/detail/{packetId}")
// @ApiOperation("查询红包详情")
// @Operation(summary = "查询红包详情")
// public R<RedPacketDetailVO> getRedPacketDetail(@PathVariable Long packetId) {
// RedPacketDetailVO detail = redPacketService.getRedPacketDetail(packetId);
// return R.ok(detail);

9
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/VerificationCodeController.java
View File

@ -1,12 +1,15 @@
package com.wzj.soopin.order.controller;
import com.wzj.soopin.order.domain.dto.CodeVerificationDto;
import com.wzj.soopin.order.service.VerificationCodeService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.domain.R;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* 核销码相关接口
@ -27,7 +30,7 @@ public class VerificationCodeController {
* 生成核销码
*/
@GetMapping("/generate/{orderId}")
@Tag(name = "生成核销码")
@Operation(summary = "生成核销码")
public R generateCode(@PathVariable Long orderId) {
return verificationCodeService.generateVerificationCode(orderId);
}

26
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/WechatPaymentHistoryController.java
View File

@ -1,3 +1,4 @@
package com.wzj.soopin.order.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
@ -8,6 +9,7 @@ import com.wzj.soopin.order.domain.entity.WechatPaymentHistory;
import com.wzj.soopin.order.domain.vo.WechatPaymentHistoryVO;
import com.wzj.soopin.order.service.WechatPaymentHistoryService;
import com.wzj.soopin.order.service.impl.WechatPaymentHistoryServiceImpl;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R;
@ -18,13 +20,14 @@ import org.dromara.common.web.core.BaseController;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 微信订单表Controller
*
* @author zcc
* &#064;date 2023-07-12
* @date 2023-07-12
*/
@Tag(name ="微信订单表接口列表")
@Tag(name = "微信订单表")
@RestController
@RequestMapping("/pms/omsWechatPaymentHistory")
@RequiredArgsConstructor
@ -33,14 +36,15 @@ public class WechatPaymentHistoryController extends BaseController {
private final WechatPaymentHistoryServiceImpl service;
private final WechatPaymentHistoryConvert convert;
private final WechatPaymentHistoryService wechatPaymentHistoryService;
@Tag(name ="查询微信订单表列表")
@Operation(summary = "查询微信订单表列表")
@PostMapping("/list")
public R<IPage<WechatPaymentHistoryVO>> list(@RequestBody WechatPaymentHistoryBo query, Page<WechatPaymentHistory> page) {
Page<WechatPaymentHistory> list = wechatPaymentHistoryService.page(page,query.toWrapper() );
return R.ok(convert.toVO(list));
}
@Tag(name ="导出微信订单表列表")
@Operation(summary = "导出微信订单表列表")
@Log(title = "微信订单表", businessType = BusinessType.EXPORT)
@PostMapping("export")
public R<String> export(WechatPaymentHistoryBo query) {
@ -49,30 +53,30 @@ public class WechatPaymentHistoryController extends BaseController {
return R.ok(util.writeExcel(convert.toVO(list), "微信订单表数据"));
}
@Tag(name ="获取微信订单表详细信息")
@Operation(summary = "获取微信订单表详细信息")
@GetMapping(value = "/{id}")
public R getInfo(@PathVariable("id") Long id) {
return R.ok(service.getById(id));
return R.ok(service.getById(id));
}
@Tag(name ="新增微信订单表")
@Operation(summary = "新增微信订单")
@Log(title = "微信订单表", businessType = BusinessType.INSERT)
@PostMapping("/add")
public R add(@RequestBody WechatPaymentHistory wechatPaymentHistory) {
return R.ok(service.save(wechatPaymentHistory));
}
@Tag(name ="修改微信订单表")
@Operation(summary = "修改微信订单")
@Log(title = "微信订单表", businessType = BusinessType.UPDATE)
@PostMapping("/update")
public R edit(@RequestBody WechatPaymentHistory wechatPaymentHistory) {
return R.ok(service.updateById(wechatPaymentHistory));
}
@Tag(name ="删除微信订单表")
@Operation(summary = "删除微信订单")
@Log(title = "微信订单表", businessType = BusinessType.DELETE)
@DeleteMapping("/{id}")
@DeleteMapping("/{id}")
public R remove(@PathVariable Long id) {
return R.ok(service.removeById(id));
return R.ok(service.removeById(id));
}
}

12
ruoyi-modules/ruoyi-statistics/src/main/java/com/wzj/soopin/statistics/controller/GoodsStatisticsManagerController.java
View File

@ -1,13 +1,13 @@
package com.wzj.soopin.statistics.controller;
import com.wzj.soopin.statistics.entity.dto.GoodsStatisticsQueryParam;
import com.wzj.soopin.statistics.entity.enums.StatisticsQuery;
import com.wzj.soopin.statistics.entity.vo.CategoryStatisticsDataVO;
import com.wzj.soopin.statistics.entity.vo.GoodsStatisticsDataVO;
import com.wzj.soopin.statistics.service.StoreFlowStatisticsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.dromara.common.core.domain.R;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@ -22,20 +22,20 @@ import java.util.List;
* @author Bulbasaur
* @since 2020/12/9 19:04
*/
@Api(tags = "管理端,商品流水统计接口")
@Tag(name = "管理端,商品流水统计接口")
@RestController
@RequestMapping("/manager/statistics/goods")
public class GoodsStatisticsManagerController {
@Autowired
private StoreFlowStatisticsService storeFlowStatisticsService;
@ApiOperation(value = "获取统计列表,排行前一百的数据")
@Operation(summary = "获取统计列表,排行前一百的数据")
@GetMapping
public R<List<GoodsStatisticsDataVO>> getByPage(GoodsStatisticsQueryParam goodsStatisticsQueryParam) {
return R.ok(storeFlowStatisticsService.getGoodsStatisticsData(goodsStatisticsQueryParam, 100));
}
@ApiOperation(value = "获取行业统计列表")
@Operation(summary = "获取行业统计列表")
@GetMapping("/getCategoryByPage")
public R<List<CategoryStatisticsDataVO>> getCategoryByPage(GoodsStatisticsQueryParam goodsStatisticsQueryParam) {
return R.ok(storeFlowStatisticsService.getCategoryStatisticsData(goodsStatisticsQueryParam));

15
ruoyi-modules/ruoyi-statistics/src/main/java/com/wzj/soopin/statistics/controller/IndexStatisticsManagerController.java
View File

@ -1,3 +1,4 @@
package com.wzj.soopin.statistics.controller;
import com.wzj.soopin.statistics.entity.dto.GoodsStatisticsQueryParam;
@ -8,8 +9,8 @@ import com.wzj.soopin.statistics.entity.vo.IndexNoticeVO;
import com.wzj.soopin.statistics.entity.vo.IndexStatisticsVO;
import com.wzj.soopin.statistics.entity.vo.StoreStatisticsDataVO;
import com.wzj.soopin.statistics.service.IndexStatisticsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.domain.R;
import org.springframework.beans.factory.annotation.Autowired;
@ -26,7 +27,7 @@ import java.util.List;
* @since 2020/12/15 17:53
*/
@Slf4j
@Api(tags = "管理端,首页统计数据接口")
@Tag(name = "管理端,首页统计数据接口")
@RestController
@RequestMapping("/manager/statistics/index")
public class IndexStatisticsManagerController {
@ -37,7 +38,7 @@ public class IndexStatisticsManagerController {
@Autowired
private IndexStatisticsService indexStatisticsService;
@ApiOperation(value = "获取首页查询数据")
@Operation(summary = "获取首页查询数据")
@GetMapping
public R<IndexStatisticsVO> index() {
try {
@ -48,7 +49,7 @@ public class IndexStatisticsManagerController {
return null;
}
@ApiOperation(value = "获取首页查询热卖商品TOP10")
@Operation(summary = "获取首页查询热卖商品TOP10")
@GetMapping("/goodsStatistics")
public R<List<GoodsStatisticsDataVO>> goodsStatistics(GoodsStatisticsQueryParam goodsStatisticsQueryParam) {
@ -57,13 +58,13 @@ public class IndexStatisticsManagerController {
return R.ok(indexStatisticsService.goodsStatistics(goodsStatisticsQueryParam));
}
@ApiOperation(value = "获取首页查询热卖店铺TOP10")
@Operation(summary = "获取首页查询热卖店铺TOP10")
@GetMapping("/storeStatistics")
public R<List<StoreStatisticsDataVO>> storeStatistics(StatisticsQueryParam statisticsQueryParam) {
return R.ok(indexStatisticsService.storeStatistics(statisticsQueryParam));
}
@ApiOperation(value = "通知提示信息")
@Operation(summary = "通知提示信息")
@GetMapping("/notice")
public R<IndexNoticeVO> notice() {
return R.ok(indexStatisticsService.indexNotice());

7
ruoyi-modules/ruoyi-statistics/src/main/java/com/wzj/soopin/statistics/controller/MemberStatisticsManagerController.java
View File

@ -3,8 +3,9 @@ package com.wzj.soopin.statistics.controller;
import com.wzj.soopin.statistics.entity.dos.MemberStatisticsData;
import com.wzj.soopin.statistics.entity.dto.StatisticsQueryParam;
import com.wzj.soopin.statistics.service.MemberStatisticsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.dromara.common.core.domain.R;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@ -19,14 +20,14 @@ import java.util.List;
* @author Bulbasaur
* @since 2020/12/9 19:04
*/
@Api(tags = "管理端,会员统计接口")
@Tag(name = "管理端,会员统计接口")
@RestController
@RequestMapping("/manager/statistics/member")
public class MemberStatisticsManagerController {
@Autowired
private MemberStatisticsService memberStatisticsService;
@ApiOperation(value = "获取会员统计")
@Operation(summary = "获取会员统计")
@GetMapping
public R<List<MemberStatisticsData>> getByList(StatisticsQueryParam statisticsQueryParam) {
return R.ok(memberStatisticsService.statistics(statisticsQueryParam));

17
ruoyi-modules/ruoyi-statistics/src/main/java/com/wzj/soopin/statistics/controller/OrderStatisticsManagerController.java
View File

@ -1,3 +1,4 @@
package com.wzj.soopin.statistics.controller;
@ -10,8 +11,8 @@ import com.wzj.soopin.statistics.entity.vo.OrderSimpleVO;
import com.wzj.soopin.statistics.entity.vo.OrderStatisticsDataVO;
import com.wzj.soopin.statistics.service.AfterSaleStatisticsService;
import com.wzj.soopin.statistics.service.OrderStatisticsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.domain.R;
@ -30,7 +31,7 @@ import java.util.List;
* @since 2020/12/9 19:04
*/
@Slf4j
@Api(tags = "管理端,订单统计接口")
@Tag(name = "管理端,订单统计接口")
@RestController
@RequestMapping("/manager/statistics/order")
public class OrderStatisticsManagerController {
@ -39,7 +40,7 @@ public class OrderStatisticsManagerController {
@Autowired
private AfterSaleStatisticsService afterSaleStatisticsService;
@ApiOperation(value = "订单概览统计")
@Operation(summary = "订单概览统计")
@GetMapping("/overview")
public R<OrderOverviewVO> overview(StatisticsQueryParam statisticsQueryParam) {
try {
@ -50,7 +51,7 @@ public class OrderStatisticsManagerController {
return null;
}
@ApiOperation(value = "订单图表统计")
@Operation(summary = "订单图表统计")
@GetMapping
public R<List<OrderStatisticsDataVO>> statisticsChart(StatisticsQueryParam statisticsQueryParam) {
try {
@ -62,7 +63,7 @@ public class OrderStatisticsManagerController {
}
@ApiOperation(value = "订单统计")
@Operation(summary = "订单统计")
@GetMapping("/order")
public R<IPage<OrderSimpleVO>> order(StatisticsQueryParam statisticsQueryParam, PageVO pageVO) {
try {
@ -74,13 +75,13 @@ public class OrderStatisticsManagerController {
}
@ApiOperation(value = "退单统计")
@Operation(summary = "退单统计")
@GetMapping("/refund")
public R<IPage<Aftersale>> refund(StatisticsQueryParam statisticsQueryParam, PageVO pageVO) {
return R.ok(afterSaleStatisticsService.getStatistics(statisticsQueryParam, pageVO));
}
@ApiOperation(value = "退单统计导出")
@Operation(summary = "退单统计导出")
@GetMapping("/refund/export")
public void exportRefund(StatisticsQueryParam statisticsQueryParam, HttpServletResponse response) throws IOException {
afterSaleStatisticsService.exportRefund(statisticsQueryParam, response);

9
ruoyi-modules/ruoyi-statistics/src/main/java/com/wzj/soopin/statistics/controller/RefundOrderStatisticsManagerController.java
View File

@ -6,8 +6,9 @@ import com.wzj.soopin.order.domain.vo.PageVO;
import com.wzj.soopin.statistics.entity.dto.StatisticsQueryParam;
import com.wzj.soopin.statistics.entity.vo.RefundOrderStatisticsDataVO;
import com.wzj.soopin.statistics.service.RefundOrderStatisticsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.dromara.common.core.domain.R;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@ -20,20 +21,20 @@ import org.springframework.web.bind.annotation.RestController;
* @author Bulbasaur
* @since 2020/12/9 19:04
*/
@Api(tags = "管理端,退款统计接口")
@Tag(name = "管理端,退款统计接口")
@RestController
@RequestMapping("/manager/statistics/refundOrder")
public class RefundOrderStatisticsManagerController {
@Autowired
private RefundOrderStatisticsService refundOrderStatisticsService;
@ApiOperation(value = "获取退款统计列表")
@Operation(summary = "获取退款统计列表")
@GetMapping("/getByPage")
public R<IPage<RefundOrderStatisticsDataVO>> getByPage(PageVO pageVO, StatisticsQueryParam statisticsQueryParam) {
return R.ok(refundOrderStatisticsService.getRefundOrderStatisticsData(pageVO, statisticsQueryParam));
}
@ApiOperation(value = "获取退款统计金额")
@Operation(summary = "获取退款统计金额")
@GetMapping("/getPrice")
public R<Object> getPrice(StatisticsQueryParam statisticsQueryParam) {
return R.ok(refundOrderStatisticsService.getRefundOrderStatisticsPrice(statisticsQueryParam));

15
ruoyi-modules/ruoyi-statistics/src/main/java/com/wzj/soopin/statistics/controller/ViewStatisticsManagerController.java
View File

@ -1,3 +1,4 @@
package com.wzj.soopin.statistics.controller;
@ -6,8 +7,8 @@ import com.wzj.soopin.statistics.entity.vo.MemberDistributionVO;
import com.wzj.soopin.statistics.entity.vo.OnlineMemberVO;
import com.wzj.soopin.statistics.entity.vo.PlatformViewVO;
import com.wzj.soopin.statistics.service.PlatformViewService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.dromara.common.core.domain.R;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@ -22,33 +23,33 @@ import java.util.List;
* @author Chopper
* @since 2021/2/9 11:19
*/
@Api(tags = "管理端,流量统计接口")
@Tag(name = "管理端,流量统计接口")
@RestController
@RequestMapping("/manager/statistics/view")
public class ViewStatisticsManagerController {
@Autowired
private PlatformViewService platformViewService;
@ApiOperation(value = "流量数据 表单获取")
@Operation(summary = "流量数据 表单获取")
@GetMapping("/list")
public R<List<PlatformViewVO>> getByPage(StatisticsQueryParam queryParam) {
return R.ok(platformViewService.list(queryParam));
}
@ApiOperation(value = "当前在线人数")
@Operation(summary = "当前在线人数")
@GetMapping("/online/current")
public R<Long> currentNumberPeopleOnline() {
return R.ok(platformViewService.online());
}
@ApiOperation(value = "会员分布")
@Operation(summary = "会员分布")
@GetMapping("/online/distribution")
public R<List<MemberDistributionVO>> memberDistribution() {
return R.ok(platformViewService.memberDistribution());
}
@ApiOperation(value = "在线人数历史（默认48小时）")
@Operation(summary = "在线人数历史（默认48小时）")
@GetMapping("/online/history")
public R<List<OnlineMemberVO>> history() {
return R.ok(platformViewService.statisticsOnline());

2
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/CommissionSectionController.java
View File

@ -44,7 +44,7 @@ public class CommissionSectionController {
/** 分页查询 */
@Tag(name = "查询分成比例区间列表")
@Operation(summary = "查询分成比例区间列表")
@SaCheckPermission("system:commissionsection:list")
@PostMapping("/list")
public R<Page<CommissionSectionVo>> list(@RequestBody CommissionSectionBo bo, @RequestBody Page<CommissionSection> page) {