clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

未支付的订单可以取消，跳过退款

This commit is contained in:
Hawking 2023-04-20 21:40:22 +08:00
parent 2077230be3
commit e2dfdd057e
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java
View File

@ -259,10 +259,8 @@ public class OrderDetailServiceImpl implements OrderDetailService {
// 判断是否是已付款的订单,未付款不需要退款
FinancialMaster financialMaster = financialMasterService.selectByOrderMasterId(orderDetail.getOrderMasterId());
Assert.notNull(financialMaster, "找不到对应的财务单");
if (PayStatus.PAID.getCode().equals(financialMaster.getPayStatus())) {
// 发起退款
refund(orderDetail);
}
// 发起退款
refund(orderDetail);
// 如果除了这个子订单以外 没有其它未取消的订单
boolean allCancel = true;
for (OrderDetail od : orderDetails) {

7
ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java
View File

@ -309,11 +309,8 @@ public class OrderMasterServiceImpl implements OrderMasterService {
update.setOrderMasterId(orderMasterId);
update.setOrderStatus(OrderStatus.CANCEL.code());
orderDetailService.updateByOrderMasterId(update);
// 发起退款 -- 如果是未付款的单，不需要退款
FinancialMaster financialMaster = financialMasterService.selectByOrderMasterId(orderMasterId);
if (PayStatus.PAID.getCode().equals(financialMaster.getPayStatus())) {
refund(orderMaster);
}
// 发起退款
refund(orderMaster);
break;
case 2: // 待上门状态需要师傅同意才能取消
updateStatus(orderMasterId, OrderStatus.GOING_CANCEL.code());