From bde82b28225f9db8d6cc2af4dd91d8bc23d1aa7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Wed, 3 Jul 2024 22:04:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A5=97=E9=A4=90=E5=BE=85=E8=A1=A5=E5=8D=95?= =?UTF-8?q?=E4=B8=8B=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artificer/service/impl/OrdersServiceImpl.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) 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 0a22186..bb4f073 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 @@ -3316,6 +3316,15 @@ public class OrdersServiceImpl extends ServiceImpl implements } } if (isAuto == 1) { + Integer minutes = Integer.valueOf(commonInfoService.findOne(452).getValue()); + String serveTime = orders.getServeTime(); + Date serveTimeDate = DateUtils.stringToDate(serveTime,"yyyy-MM-dd HH:mm"); + serveTimeDate = DateUtils.addDateMinutes(serveTimeDate,minutes); + Date currentDate = new Date(); + if(currentDate.getTime()>serveTimeDate.getTime()){ + }else{ + return Result.error("当前单据不满足待补单条件！"); + } //按照比例 将扣除的车费钱 BigDecimal taxiMoney = orders.getTaxiMoney(); BigDecimal sumMoney = orders.getTaxiMoney();//总扣费 @@ -3369,9 +3378,13 @@ public class OrdersServiceImpl extends ServiceImpl implements baseMapper.updateById(orders); cancelSupplementOrders(userId, orders.getOldOrdersId(), isAuto, 1);//退原单，原单的车费已被退/扣，所以只退项目 }else{ + BigDecimal taxiMoney = orders.getTaxiMoney(); + BigDecimal artificerMoney = orders.getArtificerMoney().subtract(taxiMoney); orders.setRefusalContent(""); orders.setTaxiMoney(BigDecimal.ZERO); orders.setStatus(10); + orders.setArtificerMoney(artificerMoney); + orders.setSumArtificerMoney(artificerMoney); baseMapper.updateById(orders); } }