app获取订单明细接口增加可按编码进行查询

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/service/impl/OrderServiceImpl.java

@@ -6273,11 +6273,21 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 	 */
 	@Override
 	public PjOrder getAppMessageById(PjOrder order) {
-		PjOrder detail = baseMapper.selectById(order.getId());
+		BladeUser appUser = AuthUtil.getUser();
+		PjOrder detail;
+		if (!Objects.isNull(order.getId())) {
+			detail = baseMapper.selectById(order.getId());
+		} else {
+			detail = baseMapper.selectOne(new LambdaQueryWrapper<PjOrder>().eq(PjOrder::getOrdNo, order.getOrdNo())
+				.eq(PjOrder::getIsDeleted, 0).eq(PjOrder::getTenantId, appUser.getTenantId()));
+		}
+		if (ObjectUtil.isEmpty(detail)) {
+			return detail;
+		}
 
 		//获得销售明细
 		LambdaQueryWrapper<PjOrderItems> itemsLambdaQueryWrapper = new LambdaQueryWrapper<>();
-		itemsLambdaQueryWrapper.eq(PjOrderItems::getTenantId, AuthUtil.getTenantId())
+		itemsLambdaQueryWrapper.eq(PjOrderItems::getTenantId, appUser.getTenantId())
 			.eq(PjOrderItems::getIsDeleted, 0)
 			.eq(PjOrderItems::getPid, detail.getId());
 		List<PjOrderItems> orderItems = orderItemsService.list(itemsLambdaQueryWrapper);
@@ -6291,7 +6301,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 				goodsFilesList = goodsFilesService.list(new LambdaQueryWrapper<PjGoodsFiles>()
 					.eq(PjGoodsFiles::getMainImage, 0)
 					.in(PjGoodsFiles::getPid, goodsId)
-					.eq(PjGoodsFiles::getTenantId, AuthUtil.getTenantId())
+					.eq(PjGoodsFiles::getTenantId, appUser.getTenantId())
 					.eq(PjGoodsFiles::getIsDeleted, 0));
 			}
 			if (!brandIds.isEmpty()) {