|
|
@@ -1660,9 +1660,9 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
|
|
|
.eq("order_id", records.get(i).getOrderId()));
|
|
|
tbOrderIPage.getRecords().get(i).setOrderGoodsList(orderGoodsList);
|
|
|
//判断骑手是否接单 status13为待骑手接单
|
|
|
- if (records.get(i).getOrderTypeExtra() == 2 && "2".equals(records.get(i).getIndentState())) {
|
|
|
- tbOrderIPage.getRecords().get(i).setStatus(13);
|
|
|
- }
|
|
|
+// if (records.get(i).getOrderTypeExtra() == 2 && "2".equals(records.get(i).getIndentState())) {
|
|
|
+// tbOrderIPage.getRecords().get(i).setStatus(13);
|
|
|
+// }
|
|
|
}
|
|
|
PageUtils pageUtils = new PageUtils(tbOrderIPage);
|
|
|
return Result.success().put("data", pageUtils);
|
|
|
@@ -1693,9 +1693,9 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
|
|
|
tbOrder.setShopName(goodsShop.getShopName());
|
|
|
tbOrder.setShopPhone(goodsShop.getPhone());
|
|
|
}
|
|
|
- if (tbOrder.getOrderTypeExtra() == 2 && "2".equals(tbOrder.getIndentState())) {
|
|
|
- tbOrder.setStatus(13);
|
|
|
- }
|
|
|
+// if (tbOrder.getOrderTypeExtra() == 2 && "2".equals(tbOrder.getIndentState())) {
|
|
|
+// tbOrder.setStatus(13);
|
|
|
+// }
|
|
|
List<OrderGoods> orderGoodsList = orderGoodsDao.selectList(new QueryWrapper<OrderGoods>().eq("order_id", tbOrder.getOrderId()));
|
|
|
tbOrder.setOrderGoodsList(orderGoodsList);
|
|
|
TbIndent tbIndent = tbIndentService.getOne(new QueryWrapper<TbIndent>().eq("order_id", tbOrder.getOrderId()));
|