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

增加新订单状态 来表示提现未到账

This commit is contained in:
cb 2025-06-14 12:46:35 +08:00
parent e8af400536
commit 547fcfc37b
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ghy-common/src/main/java/com/ghy/common/enums/OrderStatus.java
View File

@ -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;

4
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));
// 修改主订单状态
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());
}
/**

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

@ -130,7 +130,7 @@ public class OrderServiceImpl implements OrderService {
return;
}
List<Integer> list=new ArrayList<>();
list.add(OrderStatus.FINISH_CHECK.code());
list.add(OrderStatus.Pending.code());
List<OrderMaster> orderMasterFinish = orderMasterService.selectByStatus(list);
for (OrderMaster orderMaster:orderMasterFinish){
List<OrderDetail> orderDetailList=orderDetailService.selectByOrderMasterId(orderMaster.getId());