Browse Source

小程序我的订单增加排序

liyuan 8 months ago
parent
commit
e2ed6dbf11

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

@@ -4692,12 +4692,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 			.eq(ObjectUtils.isNotEmpty(order.getSalesCompanyName()), PjOrder::getSalesCompanyName, order.getSalesCompanyName())
 			.and(ObjectUtils.isNotNull(order.getRetrieval()), i -> i.like(PjOrder::getGoodsNameJoin, order.getRetrieval())
 				.or().like(PjOrder::getShortcutJoin, order.getRetrieval()))
-			.apply(ObjectUtils.isNotEmpty(order.getXcxStatus()), "find_in_set(xcx_status,'" + order.getXcxStatus() + "')")
-			.orderByDesc(PjOrder::getCreateTime);
+			.apply(ObjectUtils.isNotEmpty(order.getXcxStatus()), "find_in_set(xcx_status,'" + order.getXcxStatus() + "')");
 		if (AuthUtil.getUserRole().contains("客户")) {
 			lambdaQueryWrapper.eq(PjOrder::getCreateUser, AuthUtil.getUserId());
 		}
 		lambdaQueryWrapper.groupBy(PjOrder::getSrcOrdNo);
+		query.setDescs("create_time");
 		IPage<PjOrder> pages = orderMapper.selectPage(Condition.getPage(query), lambdaQueryWrapper);
 		if (pages.getRecords().isEmpty()) {
 			return pages;