代码生成排序、小程序我的订单图片不显示问题优化

blade-ops/blade-develop/src/main/java/org/springblade/develop/controller/CodeController.java

@@ -79,7 +79,7 @@ public class CodeController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入code")
 	public R<IPage<Code>> list(@ApiIgnore @RequestParam Map<String, Object> code, Query query) {
-		IPage<Code> pages = codeService.page(Condition.getPage(query), Condition.getQueryWrapper(code, Code.class));
+		IPage<Code> pages = codeService.page(Condition.getPage(query), Condition.getQueryWrapper(code, Code.class).orderByDesc("id"));
 		return R.data(pages);
 	}
 

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

@@ -4736,6 +4736,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 		// 从品牌中获取图片
 		List<Long> brandIds = itemsList.stream().map(PjOrderItems::getBrandId).filter(Objects::nonNull).distinct().collect(Collectors.toList());
 		List<PjBrandFiles> brandFilesList = null;
+		List<BrandFigure> brandFigureList = null;
 		if (!brandIds.isEmpty()) {
 			brandFilesList = brandFilesService.list(new LambdaQueryWrapper<PjBrandFiles>()
 				.eq(PjBrandFiles::getMainImage, 0)
@@ -4743,6 +4744,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 				.eq(PjBrandFiles::getIsDeleted, 0)
 				.in(PjBrandFiles::getPid, brandIds)
 			);
+			brandFigureList = brandFigureService.list(new LambdaQueryWrapper<BrandFigure>()
+				.eq(BrandFigure::getTenantId, user.getTenantId())
+				.eq(BrandFigure::getIsDeleted, 0)
+				.in(BrandFigure::getPid, brandIds));
 		}
 		for (PjOrder e : pages.getRecords()) {
 			List<PjOrderItems> nowOrderItems = itemsList.stream().filter(e1 -> e1.getPid().equals(e.getId())).collect(Collectors.toList());
@@ -4760,6 +4765,14 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 				if (brandFilesList == null) {
 					continue;
 				}
+				if (brandFigureList == null) {
+					continue;
+				}
+				BrandFigure brandFigure = brandFigureList.stream().filter(brand -> brand.getPid().equals(item.getBrandId())).findFirst().orElse(null);
+				if (brandFigure != null) {
+					item.setUrl(brandFigure.getUrl());
+					continue;
+				}
 				PjBrandFiles brandFiles = brandFilesList.stream().filter(brand -> brand.getPid().equals(item.getBrandId())).findFirst().orElse(null);
 				if (brandFiles == null) {
 					continue;