update 修改逻辑卡号功能、占桩订单区分运营商和站点

This commit is contained in:
Lemon
2024-07-15 14:14:01 +08:00
parent 217284e272
commit 513ea9da4f
9 changed files with 183 additions and 20 deletions

View File

@@ -2,10 +2,12 @@ package com.jsowell.pile.service.impl;
import com.alibaba.fastjson2.JSON;
import com.github.pagehelper.PageInfo;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.jsowell.adapay.service.AdapayService;
import com.jsowell.common.constant.CacheConstants;
import com.jsowell.common.constant.Constants;
import com.jsowell.common.core.domain.vo.AuthorizedDeptVO;
import com.jsowell.common.core.page.PageResponse;
import com.jsowell.common.core.redis.RedisCache;
import com.jsowell.common.enums.DelFlagEnum;
@@ -26,6 +28,7 @@ import com.jsowell.pile.domain.ykcCommond.RemoteControlGroundLockCommand;
import com.jsowell.pile.dto.*;
import com.jsowell.pile.mapper.OrderPileOccupyMapper;
import com.jsowell.pile.service.*;
import com.jsowell.pile.util.UserUtils;
import com.jsowell.pile.vo.base.PileInfoVO;
import com.jsowell.pile.vo.uniapp.MemberVO;
import com.jsowell.pile.vo.uniapp.OccupyOrderDetailVO;
@@ -152,9 +155,20 @@ public class OrderPileOccupyServiceImpl implements OrderPileOccupyService {
return orderPileOccupyMapper.selectOrderPileOccupyList(orderPileOccupy);
}
@Override
public List<OccupyOrderVO> getOrderPileOccupyList(OrderPileOccupy orderPileOccupy) {
return orderPileOccupyMapper.getOrderPileOccupyList(orderPileOccupy);
/**
* 获取占桩订单列表
* @param dto 占桩订单
* @return
*/
public List<OccupyOrderVO> getOrderPileOccupyListWithAuth(OrderPileOccupyDTO dto) {
AuthorizedDeptVO authorizedMap = UserUtils.getAuthorizedMap();
if (authorizedMap == null) {
// 为空表示没有权限,返回空数组
return Lists.newArrayList();
}
dto.setStationDeptIds(authorizedMap.getStationDeptIds());
dto.setMerchantDeptIds(authorizedMap.getMerchantDeptIds());
return orderPileOccupyMapper.getOrderPileOccupyList(dto);
}
/**