Merge remote-tracking branch 'origin/master'

luodangjia

2024-12-19 60f70f7409ec1ece8905e088fb43e0cb0258a70b

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

@@ -9,6 +9,7 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.bean.BeanUtils;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.order.mapper.RefundPassMapper;
import com.ruoyi.order.model.Order;
@@ -107,7 +108,7 @@
    * @return
    */
   @Override
   public List<OrderRefundPassList> getOrderRefundPassList(OrderRefundPassListVo refundPassListVo) {
   public PageInfo<OrderRefundPassList> getOrderRefundPassList(OrderRefundPassListVo refundPassListVo) {
      Long userid = tokenService.getLoginUser().getUserid();
      SysUser sysUser = sysUserClient.getSysUser(userid).getData();
      Integer shopId = null;
@@ -127,13 +128,14 @@
         List<Long> collect = data.stream().map(AppUser::getId).collect(Collectors.toList());
         appUserIds.addAll(collect);
      }
      List<OrderRefundPassList> orderRefundPassList = this.baseMapper.getOrderRefundPassList(refundPassListVo.getCode(), appUserIds, shopId, refundPassListVo.getRefundMethod(), refundPassListVo.getStatus());
      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) {
         AppUser appUser = appUserClient.getAppUserById(refundPassList.getAppUserId());
         refundPassList.setUserName(appUser.getName());
         refundPassList.setPhone(appUser.getPhone());
      }
      return orderRefundPassList;
      return pageInfo.setRecords(orderRefundPassList);
   }