diff --git a/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java b/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java
index 55c3bd0..4e08452 100644
--- a/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java
@@ -584,7 +584,7 @@ public class OrderServiceImpl implements OrderService {
         }
         LambdaQueryWrapper<OrderSubPO> querySubWrapper2 = new LambdaQueryWrapper<>();
         querySubWrapper2.eq(OrderSubPO::getOrderId, orderMainPO.getOrderId())
-                .in(OrderSubPO::getPayStatus, Arrays.asList(PayStatusEnum.SUCCESS.getCode(), PayStatusEnum.REFUNDING.getCode(), PayStatusEnum.REFUND_SUCCESS.getCode())).orderByDesc(OrderSubPO::getUpdateTime);
+                .in(OrderSubPO::getPayStatus, Arrays.asList(PayStatusEnum.USERPAYING.getCode(),PayStatusEnum.SUCCESS.getCode(), PayStatusEnum.REFUNDING.getCode(), PayStatusEnum.REFUND_SUCCESS.getCode())).orderByDesc(OrderSubPO::getUpdateTime);
         List<OrderSubPO> orderSubPOList2 = orderSubRepo.list(querySubWrapper2);
         if(!CollectionUtils.isEmpty(orderSubPOList2)){
             orderDetailDTO.setLastPayOrderNo(orderSubPOList2.get(0).getPaymentId());
diff --git a/src/main/resources/mapper/OrderMainMapper.xml b/src/main/resources/mapper/OrderMainMapper.xml
index f835caf..7335d86 100644
--- a/src/main/resources/mapper/OrderMainMapper.xml
+++ b/src/main/resources/mapper/OrderMainMapper.xml
@@ -52,7 +52,7 @@
                 </foreach>
             </if>
             <if test="queryBrandName != null and queryBrandName != ''">
-                and m.brand_name like concat('%', #{queryBrandName}, '%')
+                and (m.brand_name like concat('%', #{queryBrandName}, '%') or m.model_name like concat('%', #{queryBrandName}, '%'))
             </if>
         </where>
         order by o.update_time desc