yangjun
/
sadjv3_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

套餐待补单车费计算错误

This commit is contained in:
曹磊 2024-07-18 20:18:34 +08:00
parent 3078684377
commit fa5b5ff12d
2 changed files with 66 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java
View File

@ -1205,7 +1205,17 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
return Result.error("预约时间正忙，请更换其他时间！"); return Result.error("预约时间正忙，请更换其他时间！");
} }
TravelPriceVo travelPriceVo = travelConfService.calcTravelPrice(orders.getArtificerId(), orders.getLongitude(), orders.getLatitude(),orders.getServeTime()); TravelPriceVo travelPriceVo = null;
if(orders.getUserPackageDetailId() != null) {
String isTravelFree = commonInfoService.findOne(460).getValue();
if(isTravelFree.equals("是")){
tripWay = 3;
orders.setTripWay(3);
travelPriceVo = travelConfService.calcTravelPrice(orders.getArtificerId(), orders.getLongitude(), orders.getLatitude(),orders.getServeTime(),tripWay);
}
}else{
travelPriceVo = travelConfService.calcTravelPrice(orders.getArtificerId(), orders.getLongitude(), orders.getLatitude(),orders.getServeTime());
}
if (travelPriceVo == null) { if (travelPriceVo == null) {
return Result.error("暂不支持当前地址，请更换其他地址！"); return Result.error("暂不支持当前地址，请更换其他地址！");
} }
@ -2229,7 +2239,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
} }
if(CommonEnum.V3_ORDER_FORM_CANCEL_START_02 == commonEnum){ if(CommonEnum.V3_ORDER_FORM_CANCEL_START_02 == commonEnum){
//服务开始n分钟后不可以取消订单 //服务开始n分钟后不可以取消订单
return Result.error("订单已进行"+values[0]+"后，无法取消！"); return Result.error("订单已进行"+values[0]+"分钟后，无法取消！");
} }
artificerTimeService.remove(new QueryWrapper<ArtificerTime>().eq("orders_id", orders.getOrdersId())); artificerTimeService.remove(new QueryWrapper<ArtificerTime>().eq("orders_id", orders.getOrdersId()));
if(orders.getUserPackageDetailId() !=null){ if(orders.getUserPackageDetailId() !=null){

96
src/main/resources/mapper/artificer/OrdersDao.xml
View File

@ -418,6 +418,7 @@
left join tb_user u on u.user_id=o1.user_id left join tb_user u on u.user_id=o1.user_id
left join consortia c on c.consortia_id=o1.consortia_id left join consortia c on c.consortia_id=o1.consortia_id
where o1.parent_id = 0 where o1.parent_id = 0
and o1.old_orders_id is null
and o1.orders_id not in ( and o1.orders_id not in (
select orders_id from orders select orders_id from orders
where old_orders_id is not null where old_orders_id is not null
@ -595,6 +596,7 @@
from orders o from orders o
where o.artificer_id = #{userId} where o.artificer_id = #{userId}
and o.parent_id = 0 and o.parent_id = 0
and o.old_orders_id is null
and o.orders_id not in ( and o.orders_id not in (
select orders_id from orders select orders_id from orders
where old_orders_id is not null where old_orders_id is not null
@ -757,6 +759,7 @@
LEFT JOIN bl_user_package_detail bl ON bl.id = om.massage_id LEFT JOIN bl_user_package_detail bl ON bl.id = om.massage_id
where o.artificer_id = #{artificerId} where o.artificer_id = #{artificerId}
and o.parent_id = 0 and o.parent_id = 0
and o.old_orders_id is null
and o.orders_id not in ( and o.orders_id not in (
select orders_id from orders select orders_id from orders
where old_orders_id is not null where old_orders_id is not null
@ -857,6 +860,7 @@
LEFT JOIN bl_user_package_detail bl ON bl.id = om.massage_id LEFT JOIN bl_user_package_detail bl ON bl.id = om.massage_id
where o.artificer_id = #{artificerId} where o.artificer_id = #{artificerId}
and o.parent_id = 0 and o.parent_id = 0
and o.old_orders_id is null
and o.orders_id not in ( and o.orders_id not in (
select orders_id from orders select orders_id from orders
where old_orders_id is not null where old_orders_id is not null
@ -1192,15 +1196,16 @@
left join orders_massage om on om.orders_id=o.orders_id left join orders_massage om on om.orders_id=o.orders_id
where o.artificer_id = #{artificerId} where o.artificer_id = #{artificerId}
and o.parent_id = 0 and o.parent_id = 0
and o.old_orders_id is null
and o.orders_id not in ( and o.orders_id not in (
select orders_id from orders select orders_id from orders
where old_orders_id is not null where old_orders_id is not null
and status != 4 and status != 4
) )
and o.orders_id not in ( and o.orders_id not in (
select old_orders_id from orders select old_orders_id from orders
where old_orders_id is not null where old_orders_id is not null
and status != 4 and status != 4
) )
<if test="startDate!=null and startDate !=''"> <if test="startDate!=null and startDate !=''">
and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startDate} and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startDate}
@ -1237,15 +1242,16 @@
from orders o from orders o
where o.artificer_id = #{artificerId} where o.artificer_id = #{artificerId}
and o.parent_id = 0 and o.parent_id = 0
and o.old_orders_id is null
and o.orders_id not in ( and o.orders_id not in (
select orders_id from orders select orders_id from orders
where old_orders_id is not null where old_orders_id is not null
and status != 4 and status != 4
) )
and o.orders_id not in ( and o.orders_id not in (
select old_orders_id from orders select old_orders_id from orders
where old_orders_id is not null where old_orders_id is not null
and status != 4 and status != 4
) )
<if test="startDate!=null and startDate !=''"> <if test="startDate!=null and startDate !=''">
and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startDate} and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startDate}
@ -1283,15 +1289,16 @@
from orders o from orders o
where o.artificer_id = #{artificerId} where o.artificer_id = #{artificerId}
and o.parent_id = 0 and o.parent_id = 0
and o.old_orders_id is null
and o.orders_id not in ( and o.orders_id not in (
select orders_id from orders select orders_id from orders
where old_orders_id is not null where old_orders_id is not null
and status != 4 and status != 4
) )
and o.orders_id not in ( and o.orders_id not in (
select old_orders_id from orders select old_orders_id from orders
where old_orders_id is not null where old_orders_id is not null
and status != 4 and status != 4
) )
<if test="startDate!=null and startDate !=''"> <if test="startDate!=null and startDate !=''">
and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startDate} and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startDate}
@ -1328,15 +1335,16 @@
from orders o from orders o
where o.artificer_id = #{artificerId} where o.artificer_id = #{artificerId}
and o.parent_id = 0 and o.parent_id = 0
and o.old_orders_id is null
and o.orders_id not in ( and o.orders_id not in (
select orders_id from orders select orders_id from orders
where old_orders_id is not null where old_orders_id is not null
and status != 4 and status != 4
) )
and o.orders_id not in ( and o.orders_id not in (
select old_orders_id from orders select old_orders_id from orders
where old_orders_id is not null where old_orders_id is not null
and status != 4 and status != 4
) )
<if test="startDate!=null and startDate !=''"> <if test="startDate!=null and startDate !=''">
and date_format(o.end_times,'%Y-%m-%d') >= date_format(#{startDate},'%Y-%m-%d') and date_format(o.end_times,'%Y-%m-%d') >= date_format(#{startDate},'%Y-%m-%d')
@ -1371,15 +1379,16 @@
from orders o from orders o
where o.artificer_id = #{artificerId} where o.artificer_id = #{artificerId}
and o.parent_id = 0 and o.parent_id = 0
and o.old_orders_id is null
and o.orders_id not in ( and o.orders_id not in (
select orders_id from orders select orders_id from orders
where old_orders_id is not null where old_orders_id is not null
and status != 4 and status != 4
) )
and o.orders_id not in ( and o.orders_id not in (
select old_orders_id from orders select old_orders_id from orders
where old_orders_id is not null where old_orders_id is not null
and status != 4 and status != 4
) )
and o.add_num > 0 and o.add_num > 0
<if test="startDate!=null and startDate !=''"> <if test="startDate!=null and startDate !=''">
@ -1453,6 +1462,7 @@
LEFT JOIN bl_user_package_detail bl ON bl.id = om.massage_id LEFT JOIN bl_user_package_detail bl ON bl.id = om.massage_id
where o.artificer_id = #{artificerId} where o.artificer_id = #{artificerId}
and o.parent_id = 0 and o.parent_id = 0
and o.old_orders_id is null
and o.orders_id not in ( and o.orders_id not in (
select orders_id from orders select orders_id from orders
where old_orders_id is not null where old_orders_id is not null
@ -1624,15 +1634,16 @@
LEFT JOIN bl_user_package_detail bl ON bl.id = om.massage_id LEFT JOIN bl_user_package_detail bl ON bl.id = om.massage_id
where o.artificer_id = #{artificerId} where o.artificer_id = #{artificerId}
and o.parent_id = 0 and o.parent_id = 0
and o.old_orders_id is null
and o.orders_id not in ( and o.orders_id not in (
select orders_id from orders select orders_id from orders
where old_orders_id is not null where old_orders_id is not null
and status != 4 and status != 4
) )
and o.orders_id not in ( and o.orders_id not in (
select old_orders_id from orders select old_orders_id from orders
where old_orders_id is not null where old_orders_id is not null
and status != 4 and status != 4
) )
<if test="startTime!=null and startTime!=''"> <if test="startTime!=null and startTime!=''">
and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startTime} and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startTime}
@ -1688,15 +1699,16 @@
left join orders_massage om on om.orders_id=o.orders_id left join orders_massage om on om.orders_id=o.orders_id
where o.artificer_id = ${userId} where o.artificer_id = ${userId}
and o.parent_id = 0 and o.parent_id = 0
and o.old_orders_id is null
and o.orders_id not in ( and o.orders_id not in (
select orders_id from orders select orders_id from orders
where old_orders_id is not null where old_orders_id is not null
and status != 4 and status != 4
) )
and o.orders_id not in ( and o.orders_id not in (
select old_orders_id from orders select old_orders_id from orders
where old_orders_id is not null where old_orders_id is not null
and status != 4 and status != 4
) )
<if test="startTime!=null and startTime !=''"> <if test="startTime!=null and startTime !=''">
and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startTime} and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startTime}