diff --git a/ghy-common/src/main/java/com/ghy/common/enums/OrderStatus.java b/ghy-common/src/main/java/com/ghy/common/enums/OrderStatus.java index 1c037297..f88f64da 100644 --- a/ghy-common/src/main/java/com/ghy/common/enums/OrderStatus.java +++ b/ghy-common/src/main/java/com/ghy/common/enums/OrderStatus.java @@ -23,7 +23,8 @@ public enum OrderStatus implements IEnumType { SERVER(3, "服务中"), FINISH_CHECK(4, "待确认"), FINISH(5, "已完成"), - CANCEL(6, "已取消"); + CANCEL(6, "已取消"), + Pending(7,"待提现"); private final Integer code; private final String desc; diff --git a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java index 3ccde864..dc8422dd 100644 --- a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java +++ b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java @@ -193,7 +193,7 @@ public class OrderMasterServiceImpl implements OrderMasterService { Assert.notNull(payment, String.format("主订单[id=%d]找不到支付记录", orderMasterId)); // 修改主订单状态 - updateStatus(orderMasterId, OrderStatus.FINISH_CHECK.code()); + // updateStatus(orderMasterId, OrderStatus.FINISH_CHECK.code()); if (BigDecimal.ZERO.compareTo(financialMaster.getPayMoney()) > -1) { logger.info("订单[code={}]支付金额<=0,不需要分账", orderMaster.getCode()); @@ -352,7 +352,7 @@ public class OrderMasterServiceImpl implements OrderMasterService { } })); // //主订单提现成功 修改主订单状态为已完成 -// updateStatus(orderMasterId, OrderStatus.FINISH.code()); + updateStatus(orderMasterId, OrderStatus.Pending.code()); } /** diff --git a/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java b/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java index dd7adbce..abf075b1 100644 --- a/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java +++ b/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java @@ -130,7 +130,7 @@ public class OrderServiceImpl implements OrderService { return; } List list=new ArrayList<>(); - list.add(OrderStatus.FINISH_CHECK.code()); + list.add(OrderStatus.Pending.code()); List orderMasterFinish = orderMasterService.selectByStatus(list); for (OrderMaster orderMaster:orderMasterFinish){ List orderDetailList=orderDetailService.selectByOrderMasterId(orderMaster.getId());