|
@@ -769,6 +769,13 @@ public class TbIndentServiceImpl extends ServiceImpl<TbIndentDao, TbIndent> impl
|
|
|
@Override
|
|
@Override
|
|
|
public Result orderIndentReceiving(Long userId, String acquireCode) {
|
|
public Result orderIndentReceiving(Long userId, String acquireCode) {
|
|
|
try {
|
|
try {
|
|
|
|
|
+ TbOrder orderOld = appOrderService.getById(acquireCode);
|
|
|
|
|
+ if (orderOld==null){
|
|
|
|
|
+ return Result.error("接单失败,该订单不存在");
|
|
|
|
|
+ }
|
|
|
|
|
+ if (orderOld.getStatus()!=3){
|
|
|
|
|
+ return Result.error("接单失败,该订单不是待配送状态");
|
|
|
|
|
+ }
|
|
|
//判断骑手状态是否被封号
|
|
//判断骑手状态是否被封号
|
|
|
UserEntity userEntity1 = userService.selectUserById(userId);
|
|
UserEntity userEntity1 = userService.selectUserById(userId);
|
|
|
if (userEntity1.getStatus() != 1) {
|
|
if (userEntity1.getStatus() != 1) {
|