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-07-10 15:13:57 +08:00
parent 3dc68ceaf8
commit 02528c930f
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
View File

@ -418,7 +418,11 @@ public class OrderController extends BaseController {
od.setOrderMasterCode(om.getCode()); od.setOrderMasterCode(om.getCode());
od.setCustomerId(om.getCustomerId()); od.setCustomerId(om.getCustomerId());
od.setOrderType(om.getOrderType()); od.setOrderType(om.getOrderType());
od.setOrderStatus(request.getWorkerId().equals(om.getWorkerId()) ? OrderStatus.GOING.code() : OrderStatus.RECEIVE.code()); if (request.getIsQuicklyDelivery()!=null&&request.getIsQuicklyDelivery()==1){
od.setOrderStatus(OrderStatus.SERVER.code());
}else{
od.setOrderStatus(request.getWorkerId().equals(om.getWorkerId()) ? OrderStatus.GOING.code() : OrderStatus.RECEIVE.code());
}
od.setWorkerId(request.getWorkerId()); od.setWorkerId(request.getWorkerId());
od.setRevTime(om.getRevTime()); od.setRevTime(om.getRevTime());
od.setExpectTimeStart(om.getExpectTimeStart()); od.setExpectTimeStart(om.getExpectTimeStart());
@ -469,7 +473,11 @@ public class OrderController extends BaseController {
// 派完单 并且只有自己接单 // 派完单 并且只有自己接单
om2up.setHasDispatchedAll(1); om2up.setHasDispatchedAll(1);
om2up.setAllSelfAssigned(1); om2up.setAllSelfAssigned(1);
om2up.setOrderStatus(OrderStatus.GOING.code()); if (request.getIsQuicklyDelivery()!=null&&request.getIsQuicklyDelivery()==1){
om2up.setOrderStatus(OrderStatus.SERVER.code());
}else{
om2up.setOrderStatus(OrderStatus.GOING.code());
}
} else { } else {
// 派完单 但是有其他师傅接单 // 派完单 但是有其他师傅接单
om2up.setHasDispatchedAll(1); om2up.setHasDispatchedAll(1);

3
ghy-order/src/main/java/com/ghy/order/request/AppOrderAssignRequest.java
View File

@ -28,4 +28,7 @@ public class AppOrderAssignRequest {
// 分配的商品及数量 // 分配的商品及数量
private List<AppGoodsRequest> goodsList; private List<AppGoodsRequest> goodsList;
//是否立即发货
private Integer isQuicklyDelivery;
} }