取消是否要退款,需要判断是否是到付单
This commit is contained in:
parent
8b57f1d4ed
commit
575d082e2e
|
|
@ -309,8 +309,11 @@ public class OrderMasterServiceImpl implements OrderMasterService {
|
||||||
update.setOrderMasterId(orderMasterId);
|
update.setOrderMasterId(orderMasterId);
|
||||||
update.setOrderStatus(OrderStatus.CANCEL.code());
|
update.setOrderStatus(OrderStatus.CANCEL.code());
|
||||||
orderDetailService.updateByOrderMasterId(update);
|
orderDetailService.updateByOrderMasterId(update);
|
||||||
// 发起退款
|
// 发起退款 -- 如果是未付款的单,不需要退款
|
||||||
refund(orderMaster);
|
FinancialMaster financialMaster = financialMasterService.selectByOrderMasterId(orderMasterId);
|
||||||
|
if(PayStatus.PAID.getCode().equals(financialMaster.getPayStatus())){
|
||||||
|
refund(orderMaster);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case 2: // 待上门状态需要师傅同意才能取消
|
case 2: // 待上门状态需要师傅同意才能取消
|
||||||
updateStatus(orderMasterId, OrderStatus.GOING_CANCEL.code());
|
updateStatus(orderMasterId, OrderStatus.GOING_CANCEL.code());
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue