From 395021ef8754249b451ac7ee3a048d7db7795d7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Tue, 2 Jul 2024 15:26:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A5=97=E9=A4=90=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OrdersServiceImpl.java | 27 ++++++++++++++----- .../bl/massage/entity/MassagePackage.java | 6 +++++ .../mapper/bl/massage/MassagePackageDao.xml | 7 ++++- .../bl/massage/MassagePackageDetailDao.xml | 3 ++- 4 files changed, 34 insertions(+), 9 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 2a37501..31407c0 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 @@ -392,7 +392,7 @@ public class OrdersServiceImpl extends ServiceImpl implements orders.setEntryName(massageTypeName); //判断金额是否满足代金券金额最少消费额度 - if(payMoney.compareTo(couponMinMoney) < 0){ + if(price.compareTo(couponMinMoney) < 0){ return Result.error("当前应付总金额不满足优惠券使用的最小额度，请重新选择优惠券！"); } @@ -3852,12 +3852,21 @@ public class OrdersServiceImpl extends ServiceImpl implements for (Orders orders : records) { List ordersMassageList = ordersMassageService.list(new QueryWrapper().eq("orders_id", orders.getOrdersId())); for (OrdersMassage ordersMassage : ordersMassageList) { - MassageType massageType = massageTypeService.getById(ordersMassage.getMassageId()); - ordersMassage.setMassageType(massageType); - if (massageType != null) { - SysDictEntity sysDictEntity = sysDictService.getById(massageType.getClassifyId()); - if (sysDictEntity != null) { - massageType.setClassifyName(sysDictEntity.getValue()); + if(orders.getUserPackageDetailId() !=null){ + UserPackageDetail userPackageDetail = userPackageDetailService.getById(ordersMassage.getMassageId()); + UserPackage userPackage = userPackageService.getById(userPackageDetail.getMainId()); + orders.setPackageType(userPackage.getType()); + userPackageDetail.setMainTitle(userPackage.getTitle()); + userPackageDetail.setMainPrice(userPackage.getPrice()); + ordersMassage.setUserPackageDetail(userPackageDetail); + }else{ + MassageType massageType = massageTypeService.getById(ordersMassage.getMassageId()); + ordersMassage.setMassageType(massageType); + if (massageType != null) { + SysDictEntity sysDictEntity = sysDictService.getById(massageType.getClassifyId()); + if (sysDictEntity != null) { + massageType.setClassifyName(sysDictEntity.getValue()); + } } } } @@ -4851,6 +4860,8 @@ public class OrdersServiceImpl extends ServiceImpl implements @Override public Result accomplishOrders(Long ordersId, Integer type, String accomplishLongitude, String accomplishLatitude,String jsFwcn,String jsPjtag,String jsTsbz,String earlyFinishReason) { reentrantReadWriteLock.writeLock().lock(); + log.error("accomplishOrders:4881:"+accomplishLongitude); + log.error("accomplishOrders:4881:"+accomplishLatitude); try { Orders orders = baseMapper.selectById(ordersId); if (StringUtil.isEmpty(accomplishLatitude)) { @@ -4872,6 +4883,8 @@ public class OrdersServiceImpl extends ServiceImpl implements GlobalCoordinates target = new GlobalCoordinates(Double.parseDouble(accomplishLatitude), Double.parseDouble(accomplishLongitude)); Integer distances = (int) LonLatUtil.getDistanceMeter(source, target, Ellipsoid.Sphere); String value = commonInfoService.findOne(373).getValue(); + log.error("accomplishOrders:4881:"+distances); + log.error("accomplishOrders:4881:"+value); if (distances < Integer.parseInt(value)) { return Result.error("请离开当前位置" + value + "m后点击完成！"); } diff --git a/src/main/java/com/sqx/modules/bl/massage/entity/MassagePackage.java b/src/main/java/com/sqx/modules/bl/massage/entity/MassagePackage.java index 69a2c11..b7645a9 100644 --- a/src/main/java/com/sqx/modules/bl/massage/entity/MassagePackage.java +++ b/src/main/java/com/sqx/modules/bl/massage/entity/MassagePackage.java @@ -118,6 +118,12 @@ public class MassagePackage implements Serializable { @TableField(exist = false) private String typeName; + /** + * 服务次数 + */ + @TableField(exist = false) + private Integer serviceCount; + /** * 分类标识 */ diff --git a/src/main/resources/mapper/bl/massage/MassagePackageDao.xml b/src/main/resources/mapper/bl/massage/MassagePackageDao.xml index d642800..3aea239 100644 --- a/src/main/resources/mapper/bl/massage/MassagePackageDao.xml +++ b/src/main/resources/mapper/bl/massage/MassagePackageDao.xml @@ -4,7 +4,12 @@