sczx_group/sczx_order
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: sczx_group:1afa9895b0b03fbd6ff8b04bbc99e342dcb3e300
Branches Tags
sczx_group:main sczx_group:zhangli-test
...
compare: sczx_group:cdb398512080c2ff5bbaca9099ab4136208fc771
Branches Tags
sczx_group:main sczx_group:zhangli-test

2 Commits
1afa9895b0 ... cdb3985120

Author SHA1 Message Date
zhangli
cdb3985120 Merge branch 'main' into zhangli-test 2025-09-18 22:37:56 +08:00
zhangli
3d91ab0aad 解决按车型查询的结果 2025-09-18 22:37:32 +08:00
2 changed files with 2 additions and 2 deletions
Expand all files Collapse all files

2
src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java
View File

@ -584,7 +584,7 @@ public class OrderServiceImpl implements OrderService {
} }
LambdaQueryWrapper<OrderSubPO> querySubWrapper2 = new LambdaQueryWrapper<>(); LambdaQueryWrapper<OrderSubPO> querySubWrapper2 = new LambdaQueryWrapper<>();
querySubWrapper2.eq(OrderSubPO::getOrderId, orderMainPO.getOrderId()) 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); List<OrderSubPO> orderSubPOList2 = orderSubRepo.list(querySubWrapper2);
if(!CollectionUtils.isEmpty(orderSubPOList2)){ if(!CollectionUtils.isEmpty(orderSubPOList2)){
orderDetailDTO.setLastPayOrderNo(orderSubPOList2.get(0).getPaymentId()); orderDetailDTO.setLastPayOrderNo(orderSubPOList2.get(0).getPaymentId());

2
src/main/resources/mapper/OrderMainMapper.xml
View File

@ -52,7 +52,7 @@
</foreach> </foreach>
</if> </if>
<if test="queryBrandName != null and queryBrandName != ''"> <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> </if>
</where> </where>
order by o.update_time desc order by o.update_time desc