From d1cab4b2f2690d1331f12f0d9de78bbbf926f390 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 16 一月 2025 14:27:51 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/RefundPassServiceImpl.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/RefundPassServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/RefundPassServiceImpl.java
index 2635f94..8c30d85 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/RefundPassServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/RefundPassServiceImpl.java
@@ -110,6 +110,7 @@
refundPass.setPhone(jsonObject.getString("phone"));
refundPass.setAddress(jsonObject.getString("address"));
this.save(refundPass);
+ order.setOldOrderStatus(order.getOrderStatus());
order.setOrderStatus(7);
orderService.updateById(order);
return R.ok();
@@ -130,17 +131,24 @@
}
List<Long> appUserIds = new ArrayList<>();
//搜索条件，用户姓名
- if(StringUtils.isNotEmpty(refundPassListVo.getName())){
- List<AppUser> data = appUserClient.getAppUserByName(refundPassListVo.getName()).getData();
+ if(StringUtils.isNotEmpty(refundPassListVo.getUserName())){
+ List<AppUser> data = appUserClient.getAppUserByName(refundPassListVo.getUserName()).getData();
List<Long> collect = data.stream().map(AppUser::getId).collect(Collectors.toList());
+ if (collect.isEmpty()){
+ appUserIds.add(-1L);
+ }
appUserIds.addAll(collect);
}
//搜索条件，用户电话
if(StringUtils.isNotEmpty(refundPassListVo.getPhone())){
List<AppUser> data = appUserClient.getAppUserByPhone(refundPassListVo.getPhone()).getData();
List<Long> collect = data.stream().map(AppUser::getId).collect(Collectors.toList());
+ if (collect.isEmpty()){
+ appUserIds.add(-1L);
+ }
appUserIds.addAll(collect);
}
+
PageInfo<OrderRefundPassList> pageInfo = new PageInfo(refundPassListVo.getPageCurr(), refundPassListVo.getPageSize());
List<OrderRefundPassList> orderRefundPassList = this.baseMapper.getOrderRefundPassList(pageInfo, refundPassListVo.getCode(), appUserIds, shopId, refundPassListVo.getRefundMethod(), refundPassListVo.getStatus());
for (OrderRefundPassList refundPassList : orderRefundPassList) {
--
Gitblit v1.7.1