From 21856a348d8ee01434f8baae55a2cbc1c29aa0ee Mon Sep 17 00:00:00 2001 From: qjq <1766193529@qq.com> Date: Fri, 12 Apr 2024 11:38:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B2=BE=E5=BA=A6=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/member/service/order/OrderServiceImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/order/OrderServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/order/OrderServiceImpl.java index cc15e562..75e34396 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/order/OrderServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/order/OrderServiceImpl.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.member.service.order; +import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjUtil; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; @@ -106,8 +107,8 @@ public class OrderServiceImpl implements OrderService { AppOrderRespVO appOrderRespVO = BeanUtils.toBean(order, AppOrderRespVO.class); List appOrderDetailRespVOS = orderDetailService.selectListByOrderId(id); appOrderRespVO.setDetailList(appOrderDetailRespVOS); - BigDecimal reduce1 = appOrderDetailRespVOS.stream().map(m-> BigDecimal.valueOf(m.getHeat())).filter(heat -> ObjUtil.isNotEmpty(heat)).reduce(BigDecimal.ZERO, BigDecimal::add); - double reduce= reduce1.setScale(2, RoundingMode.HALF_UP).doubleValue(); + BigDecimal reduce1 = appOrderDetailRespVOS.stream().filter(heat -> ObjUtil.isNotEmpty(heat.getHeat())).map(m-> BigDecimal.valueOf(m.getHeat())).reduce(BigDecimal.ZERO, BigDecimal::add); + Double reduce= reduce1.setScale(2, RoundingMode.HALF_UP).doubleValue(); appOrderRespVO.setIntake(reduce); //判断时间 int hour = order.getCreateTime().getHour(); @@ -118,7 +119,7 @@ public class OrderServiceImpl implements OrderService { }else{ appOrderRespVO.setProposeIntake(proposeNight); } - appOrderRespVO.setDifference(reduce-appOrderRespVO.getProposeIntake()); + appOrderRespVO.setDifference(NumberUtil.sub(reduce,appOrderRespVO.getProposeIntake())); return appOrderRespVO; }