From 898aeda6e1678331d9482600e9aa29c4c4b8e31c Mon Sep 17 00:00:00 2001 From: seesaw Date: Tue, 10 Dec 2024 10:55:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...tatisticsSpaceCapsuleOrderServiceImpl.java | 37 ++++++++++--------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/statisticsspacecapsuleorder/StatisticsSpaceCapsuleOrderServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/statisticsspacecapsuleorder/StatisticsSpaceCapsuleOrderServiceImpl.java index a9de0580..205160d0 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/statisticsspacecapsuleorder/StatisticsSpaceCapsuleOrderServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/statisticsspacecapsuleorder/StatisticsSpaceCapsuleOrderServiceImpl.java @@ -140,25 +140,28 @@ public class StatisticsSpaceCapsuleOrderServiceImpl implements StatisticsSpaceCa .between(StatisticsSpaceCapsuleOrderDO::getCreateTime, start, end) .last(" limit 1") ); - if(ObjUtil.isNotEmpty(orderDO)){ - OrderSpaceCapsuleDO orderSpaceCapsuleDO = orderSpaceCapsuleMapper.selectById(vo.getId()); - updateStatistics(orderDO,orderSpaceCapsuleDO); - statisticsSpaceCapsuleOrderMapper.updateById(orderDO); - }else{ - CarteenRespDto carteenById = carteenApi.getCarteenById(vo.getCarteenId()); - StatisticsSpaceCapsuleOrderDO statisticsSpaceCapsuleOrderDO = getStatisticsSpaceCapsuleOrderDO(carteenById); - statisticsSpaceCapsuleOrderMapper.insert(statisticsSpaceCapsuleOrderDO); - this.updateStatistics(vo); - } + if(ObjUtil.isNotEmpty(orderDO)){ + OrderSpaceCapsuleDO orderSpaceCapsuleDO = orderSpaceCapsuleMapper.selectById(vo.getId()); + updateStatistics(orderDO,orderSpaceCapsuleDO); + statisticsSpaceCapsuleOrderMapper.updateById(orderDO); + }else{ + CarteenRespDto carteenById = carteenApi.getCarteenById(vo.getCarteenId()); + StatisticsSpaceCapsuleOrderDO statisticsSpaceCapsuleOrderDO = getStatisticsSpaceCapsuleOrderDO(carteenById); + statisticsSpaceCapsuleOrderMapper.insert(statisticsSpaceCapsuleOrderDO); + this.updateStatistics(vo); + } } public void updateStatistics( StatisticsSpaceCapsuleOrderDO orderDO,OrderSpaceCapsuleDO vo) { - //进行运算加 - orderDO.setTotalMoney(orderDO.getTotalMoney().add(vo.getMoney())); - orderDO.setTotalOrder(orderDO.getTotalOrder()+1); - orderDO.setTotalMinute(orderDO.getTotalMinute().add(new BigDecimal(vo.getComboMinutes()*vo.getComboNum()))); - orderDO.setRefundMoney(orderDO.getRefundMoney().add(vo.getRefundMoney() == null ? BigDecimal.ZERO:vo.getRefundMoney())); - orderDO.setTotalPackageSum(orderDO.getTotalPackageSum()+vo.getComboNum()); - orderDO.setTotalCustomer(orderDO.getTotalCustomer()+1); + //进行运算加 + if(SpaceCapsuleOrderEnum.SPACE_CAPSULE_ORDER_ENUM_REFUNDED.getCode().equals(vo.getStatus())){ + orderDO.setRefundMoney(orderDO.getRefundMoney().add(vo.getRefundMoney() == null ? BigDecimal.ZERO:vo.getRefundMoney())); + }else{ + orderDO.setTotalMoney(orderDO.getTotalMoney().add(vo.getMoney())); + orderDO.setTotalOrder(orderDO.getTotalOrder()+1); + orderDO.setTotalMinute(orderDO.getTotalMinute().add(new BigDecimal(vo.getComboMinutes()*vo.getComboNum()))); + orderDO.setTotalPackageSum(orderDO.getTotalPackageSum()+vo.getComboNum()); + orderDO.setTotalCustomer(orderDO.getTotalCustomer()+1); + } } @Override public void init() {