From dff7ef683bc8c324e1c28bf0cfd264cadab787ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Wed, 10 Jul 2024 11:56:07 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85=E5=BE=85?= =?UTF-8?q?=E8=A1=A5=E5=8D=95=E3=80=81=E4=BF=AE=E6=94=B9=E5=8D=95=E6=8A=80?= =?UTF-8?q?=E5=B8=88=E9=A1=B9=E7=9B=AE=E6=94=B6=E7=9B=8A=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E5=8E=9F=E5=8D=95=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OrdersServiceImpl.java | 27 ++++++++++++++++--- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java b/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java index 771aaba..63cb034 100644 --- a/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java +++ b/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java @@ -1276,10 +1276,7 @@ public class OrdersServiceImpl extends ServiceImpl implements orders.setOldMassagePrice(oldOrders.getMassagePrice()); orders.setOldMassageNum(oldOrders.getMassageNum()); orders.setOldMassageDuration(oldOrders.getDuration()); - orders.setOldArtificerMoney(oldOrders.getArtificerMoney()); - orders.setOldProjectBenefits(oldOrders.getProjectBenefits()); - baseMapper.insert(orders); ordersMassageService.removeByOrdersId(orders.getOrdersId()); List ordersMassageList = orders.getOrdersMassageList(); @@ -1377,6 +1374,12 @@ public class OrdersServiceImpl extends ServiceImpl implements ordersOld.setPingMoney(pingMoney); baseMapper.updateById(ordersOld);//原单暂变成挂单状态 + + orders.setOldArtificerMoney(oldOrders.getArtificerMoney()); + orders.setOldProjectBenefits(oldOrders.getProjectBenefits()); + + baseMapper.insert(orders); + return Result.success().put("data", orders); } //进行中项目升级 @@ -2841,7 +2844,7 @@ public class OrdersServiceImpl extends ServiceImpl implements } @Transactional - private Result cancelPackageOrders(Long userId, Orders orders, BigDecimal trafficDeduction, BigDecimal trafficRate){ + public Result cancelPackageOrders(Long userId, Orders orders, BigDecimal trafficDeduction, BigDecimal trafficRate){ //释放 UserPackageDetail userPackageDetail = new UserPackageDetail(); userPackageDetail.setId(orders.getUserPackageDetailId()); @@ -4863,6 +4866,14 @@ public class OrdersServiceImpl extends ServiceImpl implements pingMoney = pingMoney.subtract(oneUserMoney); orders.setPingMoney(pingMoney); + if(orders.getIsSupplement() != null){ + if(!orders.getIsSupplement().equals(2)){ + Orders oldOrders = baseMapper.selectById(orders.getOrdersId()); + projectBenefits = projectBenefits.add(oldOrders.getProjectBenefits()); + orders.setProjectBenefits(projectBenefits); + } + } + baseMapper.updateById(orders); if (orders.getParentId() != null && orders.getParentId() != 0) { Orders orders1 = baseMapper.selectById(orders.getParentId()); @@ -5247,6 +5258,14 @@ public class OrdersServiceImpl extends ServiceImpl implements pingMoney = pingMoney.subtract(oneUserMoney); orders.setPingMoney(pingMoney); + if(orders.getIsSupplement() != null){ + if(!orders.getIsSupplement().equals(2)){ + Orders oldOrders = baseMapper.selectById(orders.getOrdersId()); + projectBenefits = projectBenefits.add(oldOrders.getProjectBenefits()); + orders.setProjectBenefits(projectBenefits); + } + } + baseMapper.updateById(orders); if (orders.getParentId() != null && orders.getParentId() != 0) { Orders orders1 = baseMapper.selectById(orders.getParentId());