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

no message

This commit is contained in:
cb 2025-06-14 12:39:03 +08:00
parent 3524b20075
commit e8af400536
2 changed files with 18 additions and 3 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/OrderMasterServiceImpl.java
View File

@ -193,7 +193,7 @@ public class OrderMasterServiceImpl implements OrderMasterService {
Assert.notNull(payment, String.format("主订单[id=%d]找不到支付记录", orderMasterId)); Assert.notNull(payment, String.format("主订单[id=%d]找不到支付记录", orderMasterId));
// 修改主订单状态 // 修改主订单状态
// updateStatus(orderMasterId, OrderStatus.FINISH.code()); updateStatus(orderMasterId, OrderStatus.FINISH_CHECK.code());
if (BigDecimal.ZERO.compareTo(financialMaster.getPayMoney()) > -1) { if (BigDecimal.ZERO.compareTo(financialMaster.getPayMoney()) > -1) {
logger.info("订单[code={}]支付金额<=0，不需要分账", orderMaster.getCode()); logger.info("订单[code={}]支付金额<=0，不需要分账", orderMaster.getCode());
@ -351,8 +351,8 @@ public class OrderMasterServiceImpl implements OrderMasterService {
logger.error("自动发起提现失败: orderMasterId={}, memberId={}, cashAmt={}", orderMasterId, memberId, amount, e); logger.error("自动发起提现失败: orderMasterId={}, memberId={}, cashAmt={}", orderMasterId, memberId, amount, e);
} }
})); }));
//主订单提现成功 修改主订单状态为已完成 // //主订单提现成功 修改主订单状态为已完成
updateStatus(orderMasterId, OrderStatus.FINISH.code()); // updateStatus(orderMasterId, OrderStatus.FINISH.code());
} }
/** /**

15
ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java
View File

@ -129,6 +129,21 @@ public class OrderServiceImpl implements OrderService {
if (nowT.getHour() < 8 || nowT.getHour() > 20) { if (nowT.getHour() < 8 || nowT.getHour() > 20) {
return; return;
} }
List<Integer> list=new ArrayList<>();
list.add(OrderStatus.FINISH_CHECK.code());
List<OrderMaster> orderMasterFinish = orderMasterService.selectByStatus(list);
for (OrderMaster orderMaster:orderMasterFinish){
List<OrderDetail> orderDetailList=orderDetailService.selectByOrderMasterId(orderMaster.getId());
boolean allDrawCashStatusIs2 = orderDetailList != null
&& orderDetailList.stream()
.allMatch(detail -> detail.getDrawCashStatus() == 2);
if (allDrawCashStatusIs2){
orderMasterService.updateStatus(orderMaster.getId(),OrderStatus.FINISH.code());
}
}
// 查询待接单状态的主单 // 查询待接单状态的主单
List<OrderMaster> orderMasters = orderMasterService.selectByStatus(orderMasterTimeoutStatus); List<OrderMaster> orderMasters = orderMasterService.selectByStatus(orderMasterTimeoutStatus);
log.info("扫描到{}条未完成的主订单", orderMasters.size()); log.info("扫描到{}条未完成的主订单", orderMasters.size());