Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
36aa346c2a
|
|
@ -392,9 +392,9 @@ public class OrderController extends BaseController {
|
||||||
om2up.setOrderStatus(OrderStatus.GOING.code());
|
om2up.setOrderStatus(OrderStatus.GOING.code());
|
||||||
} else {
|
} else {
|
||||||
// 派完单 但是有其他师傅接单
|
// 派完单 但是有其他师傅接单
|
||||||
om2up.setHasDispatchedAll(0);
|
om2up.setHasDispatchedAll(1);
|
||||||
om2up.setAllSelfAssigned(0);
|
om2up.setAllSelfAssigned(0);
|
||||||
om2up.setOrderStatus(OrderStatus.RECEIVE.code());
|
om2up.setOrderStatus(OrderStatus.PLAIN.code());
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// 未派完单
|
// 未派完单
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue