待补单退项目
This commit is contained in:
parent
c7db94968f
commit
ebf137da71
|
@ -640,17 +640,14 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
|||
}
|
||||
|
||||
private Result insertPackageOrders(Orders orders) throws Exception{
|
||||
|
||||
BigDecimal payMoney = BigDecimal.ZERO;
|
||||
List<OrdersMassage> ordersMassageList = orders.getOrdersMassageList();
|
||||
UserPackageDetail userPackageDetail = userPackageDetailService.getById(ordersMassageList.get(0).getMassageId());
|
||||
orders.setUserPackageId(userPackageDetail.getMainId());
|
||||
orders.setUserPackageDetailId(userPackageDetail.getId());
|
||||
|
||||
if(userPackageDetail.getStatus().equals(1)){
|
||||
return Result.error("此服务项目已经被使用,无法重复使用!");
|
||||
}
|
||||
|
||||
BigDecimal price = BigDecimal.ZERO;
|
||||
BigDecimal packagePrice = BigDecimal.ZERO;
|
||||
String massageTypeName = "";
|
||||
|
@ -2781,10 +2778,9 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
|||
Orders orders = baseMapper.selectById(ordersId);
|
||||
//状态 1待支付 2待服务 3待评论 4已取消 5已完成 6进行中 7技师出发 8技师到达 9用户已支付技师待接单 10待补单
|
||||
if(orders.getOldOrdersId()!=null && orders.getOldOrdersId() !=0 && type == 1){
|
||||
|
||||
return Result.error("补差价的单据无法生成待补单!");
|
||||
}
|
||||
if (orders.getStatus() == 8 || orders.getStatus() == 9) {
|
||||
if (orders.getStatus() == 8 || orders.getStatus() == 9 || orders.getStatus() == 10) {
|
||||
if(orders.getUserPackageDetailId() !=null){
|
||||
return cancelSupplementPackageOrders(userId,orders,isAuto,type);
|
||||
}else{
|
||||
|
|
Loading…
Reference in New Issue