Merge remote-tracking branch 'origin/master'

xuhy

2025-01-16 9fde9f917552f659d41fcfce5094f429a29b8ead

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/RefundPassServiceImpl.java

@@ -131,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) {
@@ -212,6 +219,7 @@
         return R.fail("操作失败");
      }
      refundPass.setStatus(2);
      refundPass.setReceiveTime(LocalDateTime.now());
      //仅退款的售后需要将支付金额原路返回，然后再扣减支付获得的积分
      Order order = orderService.getById(refundPass.getOrderId());
      order.setOrderStatus(6);