修改统计bug和部分功能修改

Pu Zhibing

2025-03-26 cbf2486983b77a27af9968bbb362cb8d43789115

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

@@ -31,14 +31,14 @@
import com.ruoyi.system.api.feignClient.SysUserClient;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;

/**
@@ -129,21 +129,52 @@
      if(2 == sysUser.getRoleType()){
         shopId = sysUser.getObjectId();
      }
      List<Long> appUserIds = new ArrayList<>();
      //搜索条件，用户姓名和电话
      if(StringUtils.isNotEmpty(refundPassListVo.getUserName()) || StringUtils.isNotEmpty(refundPassListVo.getPhone())){
      }

      //搜索条件，用户姓名
      if(StringUtils.isNotEmpty(refundPassListVo.getName())){
         List<AppUser> data = appUserClient.getAppUserByName(refundPassListVo.getName()).getData();
         List<AppUser> data = appUserClient.getAppUserByNameNoFilter(refundPassListVo.getName()).getData();
         List<Long> collect = data.stream().map(AppUser::getId).collect(Collectors.toList());
         appUserIds.addAll(collect);
         if (CollectionUtils.isEmpty(collect)){
            return new PageInfo<>();
         }
         if(null != refundPassListVo.getAppUserIds()){
            List<Long> appUserIds = refundPassListVo.getAppUserIds();
            appUserIds.addAll(collect);
            refundPassListVo.setAppUserIds(appUserIds);
         }else{
            refundPassListVo.setAppUserIds(collect);
         }
      }
      //搜索条件，用户电话
      if(StringUtils.isNotEmpty(refundPassListVo.getPhone())){
         List<AppUser> data = appUserClient.getAppUserByPhone(refundPassListVo.getPhone()).getData();
         List<AppUser> data = appUserClient.getAppUserByPhoneNoFilter(refundPassListVo.getPhone()).getData();
         List<Long> collect = data.stream().map(AppUser::getId).collect(Collectors.toList());
         appUserIds.addAll(collect);
         if (CollectionUtils.isEmpty(collect)){
            return new PageInfo<>();
         }

         if(null != refundPassListVo.getAppUserIds()){
            List<Long> appUserIds = refundPassListVo.getAppUserIds();
            if (!containsAny(appUserIds,collect)) {
               return new PageInfo<>();
            }
            appUserIds.addAll(collect);
            refundPassListVo.setAppUserIds(appUserIds);
         }else{
            refundPassListVo.setAppUserIds(collect);
         }
      }
      if (null != refundPassListVo.getAppUserIds()){
         refundPassListVo.setAppUserIds(refundPassListVo.getAppUserIds().stream().distinct().collect(Collectors.toList()));
      }



      PageInfo<OrderRefundPassList> pageInfo = new PageInfo(refundPassListVo.getPageCurr(), refundPassListVo.getPageSize());
      List<OrderRefundPassList> orderRefundPassList = this.baseMapper.getOrderRefundPassList(pageInfo, refundPassListVo.getCode(), appUserIds, shopId, refundPassListVo.getRefundMethod(), refundPassListVo.getStatus());
      List<OrderRefundPassList> orderRefundPassList = this.baseMapper.getOrderRefundPassList(pageInfo, refundPassListVo.getCode(), refundPassListVo.getAppUserIds(), shopId, refundPassListVo.getRefundMethod(), refundPassListVo.getStatus());
      for (OrderRefundPassList refundPassList : orderRefundPassList) {
         AppUser appUser = appUserClient.getAppUserById(refundPassList.getAppUserId());
         if(null != appUser){
@@ -153,6 +184,52 @@
      }
      return pageInfo.setRecords(orderRefundPassList);
   }

   /**
    * 判断 list1 是否包含 list2 中的至少一个元素
    *
    * @param list1 第一个列表
    * @param list2 第二个列表
    * @return 如果 list1 包含 list2 中的至少一个元素，返回 true；否则返回 false
    */
   private boolean containsAny(List<Long> list1, List<Long> list2) {
      // 将 list1 转换为 HashSet 以提高查询效率
      Set<Long> set1 = new HashSet<>(list1);

      // 遍历 list2，检查是否有元素存在于 set1 中
      for (Long element : list2) {
         if (set1.contains(element)) {
            return true;
         }
      }

      // 如果没有找到共同元素，返回 false
      return false;
   }

//   public void processAppUserIds(List<Long> appUserIds , String searchKey, Function<String, R<List<AppUser>>> userSearchFunction){
//      if (StringUtils.isNotEmpty(searchKey)) {
//         List<Long> userIds = Optional.ofNullable(userSearchFunction.apply(searchKey).getData())
//               .orElse(Collections.emptyList())
//               .stream()
//               .map(AppUser::getId)
//               .collect(Collectors.toList());
//
//         if (CollectionUtils.isEmpty(userIds)) {
//            return;
//         }
//
//         List<Long> existingUserIds = orderPageList.getAppUserIds();
//         if (existingUserIds != null) {
//            if (!containsAny(existingUserIds, userIds)) {
//               return;
//            }
//            existingUserIds.addAll(userIds);
//         } else {
//            orderPageList.setAppUserIds(userIds);
//         }
//      }
//   }
   
   
   /**
@@ -212,6 +289,7 @@
         return R.fail("操作失败");
      }
      refundPass.setStatus(2);
      refundPass.setReceiveTime(LocalDateTime.now());
      //仅退款的售后需要将支付金额原路返回，然后再扣减支付获得的积分
      Order order = orderService.getById(refundPass.getOrderId());
      order.setOrderStatus(6);