From 648266357e3481e555f9c0cfbc53541185ea6d70 Mon Sep 17 00:00:00 2001
From: limqhz <540344226@qq.com>
Date: Sat, 20 Jan 2024 20:48:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E7=AF=AE=E7=90=83?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=BB=9F=E8=AE=A1=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/sv/oms/controller/OrderController.java  | 17 ++++++++++++++---
 .../main/java/com/sv/mapper/OrderMapper.java    |  2 +-
 .../java/com/sv/service/oms/OrderService.java   |  5 ++---
 .../resources/mybatis/mapper/sv/OrderMapper.xml |  2 +-
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/oms/src/main/java/com/sv/oms/controller/OrderController.java b/oms/src/main/java/com/sv/oms/controller/OrderController.java
index c14cece..8bcde28 100644
--- a/oms/src/main/java/com/sv/oms/controller/OrderController.java
+++ b/oms/src/main/java/com/sv/oms/controller/OrderController.java
@@ -1,4 +1,5 @@
 package com.sv.oms.controller;
+import com.enums.OrderTypeEnum;
 import com.sv.service.oms.OrderService;
 import com.ydd.framework.core.common.Pagination;
 import com.ydd.framework.core.common.dto.ResponseDTO;
@@ -25,7 +26,7 @@ import java.io.IOException;
 public class OrderController extends OmsController {
 
 	private final Logger logger = LoggerFactory.getLogger(OrderController.class);
-	
+
 	@Resource
 	private OrderService orderService;
 
@@ -51,13 +52,23 @@ public class OrderController extends OmsController {
 	}
 
 	/**
-	 * 查询月充值金额i
+	 * 查询月充值金额
 	 * 报表
 	 */
 	@RequestMapping(value = "/order/money", method = RequestMethod.GET)
 	public ResponseDTO findMoney(@RequestParam("time") String time) {
 		return ResponseDTO.ok()
-				.addAttribute("money", orderService.findMoney(time));
+				.addAttribute("money", orderService.findMoney(time, OrderTypeEnum.BALANCE_ORDER.value));
+	}
+
+	/**
+	 * 查询月充值金额i
+	 * 报表
+	 */
+	@RequestMapping(value = "/order/basket/money", method = RequestMethod.GET)
+	public ResponseDTO findBasketMoney(@RequestParam("time") String time) {
+		return ResponseDTO.ok()
+				.addAttribute("money", orderService.findMoney(time, OrderTypeEnum.BASKETBALL_ORDER.value));
 	}
 
 	/**
diff --git a/service/src/main/java/com/sv/mapper/OrderMapper.java b/service/src/main/java/com/sv/mapper/OrderMapper.java
index 111bde1..a158782 100644
--- a/service/src/main/java/com/sv/mapper/OrderMapper.java
+++ b/service/src/main/java/com/sv/mapper/OrderMapper.java
@@ -78,7 +78,7 @@ public interface OrderMapper {
      *
      * @return 订单报表集合
      */
-    List<OrderCheatDTO> findMoney(@Param("time") String time);
+    List<OrderCheatDTO> findMoney(@Param("time") String time,@Param("type") Integer type);
 
     /**
      * api 根据用户Id，订单号查询订单
diff --git a/service/src/main/java/com/sv/service/oms/OrderService.java b/service/src/main/java/com/sv/service/oms/OrderService.java
index 39fbddb..8c3c843 100644
--- a/service/src/main/java/com/sv/service/oms/OrderService.java
+++ b/service/src/main/java/com/sv/service/oms/OrderService.java
@@ -137,7 +137,7 @@ public class OrderService extends BaseServiceImpl {
      * @param time
      * @return
      */
-	public List<OrderCheatDTO> findMoney(String time){
+	public List<OrderCheatDTO> findMoney(String time,Integer orderType){
 		int days = 0;
 		if (StringUtils.isNotBlank(time)){
 			time = time.replace("-","");
@@ -154,8 +154,7 @@ public class OrderService extends BaseServiceImpl {
 
 		OrderCheatDTO orderDTO = new OrderCheatDTO();
 		orderDTO.setDays(days);
-
-		List<OrderCheatDTO> orderDTOS = orderMapper.findMoney(time);
+		List<OrderCheatDTO> orderDTOS = orderMapper.findMoney(time,orderType);
 		List<OrderCheatDTO> dtoList = new ArrayList<>();
 
 		for (int i=1; i <= days; i++){
diff --git a/service/src/main/resources/mybatis/mapper/sv/OrderMapper.xml b/service/src/main/resources/mybatis/mapper/sv/OrderMapper.xml
index bab302b..7df352a 100644
--- a/service/src/main/resources/mybatis/mapper/sv/OrderMapper.xml
+++ b/service/src/main/resources/mybatis/mapper/sv/OrderMapper.xml
@@ -158,7 +158,7 @@
 		FROM
 			sv_order
 		WHERE
-			(type = 2 OR type = 4)
+			type = #{type}
 			AND pay_status = 1
 			AND pay_type = 1
 			AND deleted = 0