|
|
@@ -658,7 +658,12 @@ public class TbIndentServiceImpl extends ServiceImpl<TbIndentDao, TbIndent> impl
|
|
|
}
|
|
|
if("4".equals(tbIndent.getIndentType())){
|
|
|
tbIndentDao.indentReceiv(userId, indentNumber, format,"4");
|
|
|
- }else {
|
|
|
+ } else {
|
|
|
+ TbOrder tbOrder = appOrderService.getById(tbIndent.getOrderId());
|
|
|
+ if (!Integer.valueOf(2).equals(tbOrder.getOrderTypeExtra())) {
|
|
|
+ return Result.error("当前订单为商家自配订单,您无法接单!");
|
|
|
+ }
|
|
|
+
|
|
|
tbIndentDao.indentReceiving(userId, indentNumber, format);
|
|
|
}
|
|
|
//消息推送(以前写的在下面放着)
|