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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
kuang.yife 2023-05-28 23:56:37 +08:00
parent b57a8383d2 3ec22e2a8e
commit 36aa346c2a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -231,7 +231,7 @@ public class OrderController extends BaseController {
orderMaster.setExpectTimeStart(DateUtils.parseDate(request.getServDate()+" "+split[0], "yyyy-MM-dd hh:mm"));
orderMaster.setExpectTimeEnd(DateUtils.parseDate(request.getServDate()+" "+split[1], "yyyy-MM-dd hh:mm"));
}catch (Exception e){
}
orderMasterService.insertOrderMaster(orderMaster);
Assert.notNull(orderMaster.getId(), "OrderMaster.id is null!");
@ -392,9 +392,9 @@ public class OrderController extends BaseController {
om2up.setOrderStatus(OrderStatus.GOING.code());
} else {
// 派完单 但是有其他师傅接单
om2up.setHasDispatchedAll(0);
om2up.setHasDispatchedAll(1);
om2up.setAllSelfAssigned(0);
om2up.setOrderStatus(OrderStatus.RECEIVE.code());
om2up.setOrderStatus(OrderStatus.PLAIN.code());
}
} else {
// 未派完单