lzq
/
njzscloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新订单状态，抽成共用方法

master
ljw 2025-12-23 13:51:42 +08:00
parent badc3786ba
commit 61eed2b51d
1 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java
View File

@ -968,6 +968,9 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
log.info("公司账户扣减成功，用户ID：{}，扣减金额：{}，余额：{} -> {}，结算方式：{}", log.info("公司账户扣减成功，用户ID：{}，扣减金额：{}，余额：{} -> {}，结算方式：{}",
ctx.getCompanyUserId(), payMoney, oldBalance, newBalance, ctx.getSettlementWay()); ctx.getCompanyUserId(), payMoney, oldBalance, newBalance, ctx.getSettlementWay());
// 更新订单支付状态为已支付
return updateOrderPaymentStatus(orderInfo, ctx, isIn);
} }
} else if (OrderCategory.DuanBoRu.equals(orderInfo.getOrderCategory())) { } else if (OrderCategory.DuanBoRu.equals(orderInfo.getOrderCategory())) {
// 短驳入订单，增加营收 // 短驳入订单，增加营收
@ -995,27 +998,22 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
log.info("公司营收增加成功，用户ID：{}，扣减金额：{}，余额：{} -> {}", log.info("公司营收增加成功，用户ID：{}，扣减金额：{}，余额：{} -> {}",
ctx.getCompanyUserId(), payMoney, oldRevenue, newRevenue); ctx.getCompanyUserId(), payMoney, oldRevenue, newRevenue);
}
// 更新订单支付状态为已支付 // 更新订单支付状态为已支付
OrderInfoEntity entity = new OrderInfoEntity(); return updateOrderPaymentStatus(orderInfo, ctx, isIn);
entity.setId(orderInfo.getId());
entity.setPaymentStatus(PaymentStatus.YiZhiFu);
entity.setSettlementWay(ctx.getSettlementWay());
entity.setPayTime(LocalDateTime.now());
if (!isIn) {
entity.setOrderStatus(OrderStatus.YiWanCheng);
this.updateById(entity);
return true;
} else {
this.updateById(entity);
} }
} else { } else {
// 如果支付金额为0，则直接改状态 // 如果支付金额为0，则直接改状态
// 更新订单支付状态为已支付 // 更新订单支付状态为已支付
return updateOrderPaymentStatus(orderInfo, ctx, isIn);
}
return false;
}
private boolean updateOrderPaymentStatus(OrderInfoEntity orderInfo, PaymentContextResult ctx, Boolean isIn) {
OrderInfoEntity entity = new OrderInfoEntity(); OrderInfoEntity entity = new OrderInfoEntity();
entity.setId(orderInfo.getId()); entity.setId(orderInfo.getId());
entity.setSettlementWay(ctx.getSettlementWay());
entity.setPaymentStatus(PaymentStatus.YiZhiFu); entity.setPaymentStatus(PaymentStatus.YiZhiFu);
entity.setSettlementWay(ctx.getSettlementWay());
entity.setPayTime(LocalDateTime.now()); entity.setPayTime(LocalDateTime.now());
if (!isIn) { if (!isIn) {
entity.setOrderStatus(OrderStatus.YiWanCheng); entity.setOrderStatus(OrderStatus.YiWanCheng);
@ -1023,10 +1021,9 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
return true; return true;
} else { } else {
this.updateById(entity); this.updateById(entity);
}
}
return false; return false;
} }
}
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void orderTimeOut() { public void orderTimeOut() {