From f98891b616725549277863cf69661adfc1e107b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= Date: Mon, 6 Jan 2025 22:00:18 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=A9=BA=E6=8C=87=E9=92=88bu?= =?UTF-8?q?g?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../orders/controller/OrdersController.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 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 500056d6..c64f9eab 100644 --- a/src/main/java/com/sqx/modules/orders/controller/OrdersController.java +++ b/src/main/java/com/sqx/modules/orders/controller/OrdersController.java @@ -1,15 +1,14 @@ package com.sqx.modules.orders.controller; -import cn.hutool.core.date.DateTime; +import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.NumberUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.sqx.common.utils.DateUtils; import com.sqx.common.utils.Result; -import com.sqx.modules.course.entity.CourseCollect; import com.sqx.modules.orders.service.OrdersService; import com.sqx.modules.pay.dao.CashOutDao; import com.sqx.modules.pay.entity.CashOut; -import com.sqx.modules.pay.service.CashOutService; import com.sqx.modules.sys.controller.AbstractController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -21,8 +20,6 @@ import org.springframework.web.bind.annotation.RestController; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; import java.util.*; @RestController @@ -153,10 +150,13 @@ public class OrdersController extends AbstractController { //总分销 // 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", oneMoney + twoMoney + qdMoney); + Double one = Convert.toDouble(oneMoney, 0.00d); + Double two = Convert.toDouble(twoMoney, 0.00d); + Double qd = Convert.toDouble(qdMoney, 0.00d); + result.put("oneMoney", one); + result.put("twoMoney", two); + result.put("qdMoney", qd); + result.put("sumMoney", NumberUtil.add(one, two, qd)); return Result.success().put("data", result); }