合并代码

puzhibing

2024-12-26 e93aad02d2dd2a6e624e81ea0adb3611a8fc43e5

 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);
   }
   
   
@@ -217,6 +219,8 @@
      refundPassInfo.setRefundReason(refundPass.getRefundReason());
      refundPassInfo.setUserRemark(refundPass.getUserRemark());
      refundPassInfo.setPics(refundPass.getPics());
      refundPassInfo.setPassStatus(refundPass.getPassStatus());
      refundPassInfo.setPassRemark(refundPass.getPassRemark());
      return refundPassInfo;
   }
}