修改保级功能bug

Pu Zhibing

2025-01-04 c542c56572ea8936301a6bdc736e23b846c8c006

 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;
@@ -75,7 +76,7 @@
      Order order = orderService.getById(applyRefundPass.getId());
      //判断是都已经超过售后时间
      LocalDateTime afterSaleTime = order.getAfterSaleTime();
      if(null != afterSaleTime && afterSaleTime.toEpochSecond(ZoneOffset.UTC) < LocalDateTime.now().toEpochSecond(ZoneOffset.UTC)){
      if(null != afterSaleTime && LocalDateTime.now().isAfter(afterSaleTime)){
         return R.fail("已超过售后期间");
      }
      
@@ -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;
   }
}