From 8aa9582001e46a9d621e1a6cdaafd52ee7500584 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 04 七月 2023 16:34:35 +0800
Subject: [PATCH] 商户端其他统计
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java | 46 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 39 insertions(+), 7 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java
index 77e11bb..16f5118 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java
@@ -3,23 +3,23 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.ServiceException;
-import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.order.domain.dto.*;
import com.ruoyi.order.domain.vo.*;
import com.ruoyi.order.service.order.OrderService;
import com.ruoyi.system.api.constant.AppErrorConstant;
-import com.ruoyi.system.api.domain.dto.MerPageDto;
-import com.ruoyi.system.api.domain.poji.member.Member;
+import com.ruoyi.system.api.domain.dto.MerBaseDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
import java.util.List;
+
+import static org.reflections.Reflections.log;
/**
* @author jqs34
@@ -33,9 +33,8 @@
@RequestMapping("/mer/order")
public class MerOrderController {
- @Autowired
+ @Resource
private OrderService orderService;
-
@RequestMapping(value = "/verifyCode", method = RequestMethod.POST)
@@ -55,7 +54,7 @@
merVerifyCodeVo.setMerVerifyOrderVo(merVerifyOrderVo);
break;
case 2:
- MerVerifyCouponVo merVerifyCouponVo = null;
+ MerVerifyCouponVo merVerifyCouponVo = orderService.verifyCoupon(verifyCode);
merVerifyCodeVo.setMerVerifyCouponVo(merVerifyCouponVo);
break;
case 3:
@@ -75,6 +74,15 @@
merVerifyOrderDto.setUserId(userId);
MerVerifyOrderVo merVerifyOrderVo = orderService.sureVerifyOrder(merVerifyOrderDto);
return R.ok(merVerifyOrderVo);
+ }
+
+ @RequestMapping(value = "/sureVerifyCoupon", method = RequestMethod.POST)
+ @ApiOperation(value = "核销优惠券")
+ public R<MerVerifyCouponVo> sureVerifyCoupon(@RequestBody MerVerifyCouponDto merVerifyCouponDto) {
+ Long userId = SecurityUtils.getUserId();
+ merVerifyCouponDto.setUserId(userId);
+ MerVerifyCouponVo merVerifyCouponVo = orderService.sureVerifyCoupon(merVerifyCouponDto);
+ return R.ok(merVerifyCouponVo);
}
@@ -120,4 +128,28 @@
List<MerOrderPageVo> merOrderPageVoList = orderService.pageMerOrder(page,merOrderPageDto);
return R.ok(page.setRecords(merOrderPageVoList));
}
+
+ @RequestMapping(value = "/totalMerOrder", method = RequestMethod.POST)
+ @ApiOperation(value = "商户端订单管理统计")
+ public R<MerTotalOrderVo> totalMerOrder(@RequestBody MerBaseDto merBaseDto) {
+ Long userId = SecurityUtils.getUserId();
+ merBaseDto.setUserId(userId);
+ MerTotalOrderVo totalOrderVo = orderService.totalMerOrder(merBaseDto);
+ return R.ok(totalOrderVo);
+ }
+
+ @RequestMapping(value = "/pageMerMemberOrder", method = RequestMethod.POST)
+ @ApiOperation(value = "分页商户端用户收银记录")
+ public R<Page<MerMemberNoClearOrderVo>> pageMerMemberOrder(@RequestBody MerMemberNoClearOrderDto merMemberNoClearOrderDto) {
+ Long userId = SecurityUtils.getUserId();
+ merMemberNoClearOrderDto.setUserId(userId);
+ Page<MerMemberNoClearOrderVo> page = new Page<>();
+ page.setSize(merMemberNoClearOrderDto.getPageSize());
+ page.setCurrent(merMemberNoClearOrderDto.getPageNum());
+ log.info("merMemberNoClearOrderDto----"+merMemberNoClearOrderDto.toString());
+ List<MerMemberNoClearOrderVo> merMemberNoClearOrderVoList = orderService.pageMerMemberOrder(page,merMemberNoClearOrderDto);
+ return R.ok(page.setRecords(merMemberNoClearOrderVoList));
+ }
+
+
}
--
Gitblit v1.7.1