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

取消bug

This commit is contained in:
曹磊 2024-07-10 10:56:01 +08:00
parent 6a7e21412d
commit f1389aff32
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2341,6 +2341,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
} }
@Override @Override
@Transactional
public Result cancelOrders(Long userId, Long ordersId) { public Result cancelOrders(Long userId, Long ordersId) {
Orders orders = baseMapper.selectById(ordersId); Orders orders = baseMapper.selectById(ordersId);
//状态 1待支付 2待服务 3待评论 4已取消 5已完成 6进行中 7技师出发 8技师到达 9用户已支付技师待接单 10待补单 //状态 1待支付 2待服务 3待评论 4已取消 5已完成 6进行中 7技师出发 8技师到达 9用户已支付技师待接单 10待补单
@ -2427,6 +2428,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
} }
} }
@Transactional
public Result cancelMassageOrders(Long userId, Orders orders, BigDecimal massageDeduction, BigDecimal trafficDeduction, BigDecimal massageRate, BigDecimal trafficRate){ public Result cancelMassageOrders(Long userId, Orders orders, BigDecimal massageDeduction, BigDecimal trafficDeduction, BigDecimal massageRate, BigDecimal trafficRate){
String couponIds = orders.getCouponId(); String couponIds = orders.getCouponId();
@ -2757,7 +2759,6 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
orders1.setStatus(4); orders1.setStatus(4);
baseMapper.updateById(orders1); baseMapper.updateById(orders1);
} }
orders.setStatus(4);
Artificer artificer2 = artificerService.getById(orders.getArtificerId()); Artificer artificer2 = artificerService.getById(orders.getArtificerId());
if (userId != null && artificer2.getUserId().equals(userId)) { if (userId != null && artificer2.getUserId().equals(userId)) {
@ -2814,6 +2815,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
data.put("time14", new TemplateMessageItem(DateUtils.format(new Date()), "#d71345")); data.put("time14", new TemplateMessageItem(DateUtils.format(new Date()), "#d71345"));
userService.sendWxMessage(apkey, data, userEntity.getWxOpenId()); userService.sendWxMessage(apkey, data, userEntity.getWxOpenId());
} }
orders.setStatus(4);
} }
baseMapper.updateById(orders); baseMapper.updateById(orders);
//删除技师占用时间表数据 //删除技师占用时间表数据
@ -2838,6 +2840,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
return Result.success(); return Result.success();
} }
@Transactional
private Result cancelPackageOrders(Long userId, Orders orders, BigDecimal trafficDeduction, BigDecimal trafficRate){ private Result cancelPackageOrders(Long userId, Orders orders, BigDecimal trafficDeduction, BigDecimal trafficRate){
//释放 //释放
UserPackageDetail userPackageDetail = new UserPackageDetail(); UserPackageDetail userPackageDetail = new UserPackageDetail();