From 24b94a8ec7ae2b001594f96af8b94e78d9d5a6a0 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Mon, 6 Jan 2025 10:48:00 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=BB=9F=E8=AE=A1=20Bug3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/sqx/modules/orders/controller/OrdersController.java | 4 ++-- src/main/resources/mapper/orders/OrdersDao.xml | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/sqx/modules/orders/controller/OrdersController.java b/src/main/java/com/sqx/modules/orders/controller/OrdersController.java index 3e43925b..500056d6 100644 --- a/src/main/java/com/sqx/modules/orders/controller/OrdersController.java +++ b/src/main/java/com/sqx/modules/orders/controller/OrdersController.java @@ -151,12 +151,12 @@ public class OrdersController extends AbstractController { //渠道 Double qdMoney = ordersService.selectFenXiaoMoney(3, sysUserId, flag, time); //总分销 - Double sumMoney = ordersService.selectFenXiaoMoney(4, sysUserId, flag, time); +// Double sumMoney = ordersService.selectFenXiaoMoney(4, sysUserId, flag, time); Map result = new HashMap<>(); result.put("oneMoney", oneMoney); result.put("twoMoney", twoMoney); result.put("qdMoney", qdMoney); - result.put("sumMoney", sumMoney); + result.put("sumMoney", oneMoney + twoMoney + qdMoney); return Result.success().put("data", result); } diff --git a/src/main/resources/mapper/orders/OrdersDao.xml b/src/main/resources/mapper/orders/OrdersDao.xml index 1776a9cf..802d6beb 100644 --- a/src/main/resources/mapper/orders/OrdersDao.xml +++ b/src/main/resources/mapper/orders/OrdersDao.xml @@ -241,9 +241,6 @@ sum(ifnull(qd_money,0.00)) - - sum(ifnull(one_money,0.00))+sum(ifnull(two_money,0.00))+sum(ifnull(qd_money,0.00)) - from orders where status=1