diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/business/PileBasicInfoController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/business/PileBasicInfoController.java index 46ffaf59b..893c6c86a 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/business/PileBasicInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/business/PileBasicInfoController.java @@ -7,4 +7,5 @@ package com.jsowell.api.uniapp.business; * @Date 2024/7/12 11:13:59 */ public class PileBasicInfoController { + } diff --git a/jsowell-admin/src/main/java/com/jsowell/service/CameraService.java b/jsowell-admin/src/main/java/com/jsowell/service/CameraService.java index 591ecb573..67ff3cd53 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/CameraService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/CameraService.java @@ -165,7 +165,7 @@ public class CameraService { .status(OccupyOrderStatusEnum.ORDER_HANG_UP.getCode()) // 2-订单挂起 .plateNumber(plateNumber) .build(); - List occupyList = orderPileOccupyService.getOrderPileOccupyList(occupy); + List occupyList = orderPileOccupyService.selectOrderPileOccupyList(occupy); // todo 如果有占桩订单，则先提醒“需支付占桩订单” if (CollectionUtils.isNotEmpty(occupyList)) { return "需支付占桩订单"; @@ -192,7 +192,7 @@ public class CameraService { OrderPileOccupy orderPileOccupy = OrderPileOccupy.builder() .plateNumber(plateNumber) .build(); - List orderPileOccupyList = orderPileOccupyService.getOrderPileOccupyList(orderPileOccupy); + List orderPileOccupyList = orderPileOccupyService.selectOrderPileOccupyList(orderPileOccupy); // TODO 如果有已挂起的占桩订单，则不予降锁，将“已存在有未支付的占桩订单”信息返回 if (CollectionUtils.isNotEmpty(orderPileOccupyList)) { return "已存在有未支付的占桩订单"; diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderPileOccupyController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderPileOccupyController.java index 6b871ab15..f64e1f645 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderPileOccupyController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderPileOccupyController.java @@ -4,6 +4,7 @@ import java.util.List; import javax.servlet.http.HttpServletResponse; import com.jsowell.pile.dto.MakeOrderFreeDTO; +import com.jsowell.pile.dto.OrderPileOccupyDTO; import com.jsowell.pile.service.OrderPileOccupyService; import com.jsowell.pile.vo.uniapp.OrderPileOccupyVO; import com.jsowell.pile.vo.web.OccupyOrderVO; @@ -41,10 +42,10 @@ public class OrderPileOccupyController extends BaseController { */ @PreAuthorize("@ss.hasPermi('pile:occupy:list')") @GetMapping("/list") - public TableDataInfo list(OrderPileOccupy orderPileOccupy) { + public TableDataInfo list(OrderPileOccupyDTO dto) { startPage(); // List list = orderPileOccupyService.selectOrderPileOccupyList(orderPileOccupy); - List list = orderPileOccupyService.getOrderPileOccupyList(orderPileOccupy); + List list = orderPileOccupyService.getOrderPileOccupyListWithAuth(dto); return getDataTable(list); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/OrderPileOccupyDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/OrderPileOccupyDTO.java new file mode 100644 index 000000000..34d09e1ac --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/OrderPileOccupyDTO.java @@ -0,0 +1,125 @@ +package com.jsowell.pile.dto; + +import com.jsowell.common.core.domain.BaseEntity; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +/** + * TODO + * + * @author Lemon + * @Date 2024/7/15 13:37:04 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class OrderPileOccupyDTO extends BaseEntity { + + /** + * 主键 + */ + private Integer id; + + /** + * 占桩订单编号 + */ + private String occupyCode; + + /** + * 状态（0-占桩中；1-订单完成; 2-订单挂起） + */ + private String status; + + /** + * 会员id + */ + private String memberId; + + /** + * 充电站id + */ + private String stationId; + + /** + * 车牌号码 + */ + private String plateNumber; + + /** + * 订单号 + */ + private String orderCode; + + /** + * 交易流水号 + */ + private String transactionCode; + + /** + * 占桩开始时间 + */ + private Date startTime; + + /** + * 占桩结束时间 + */ + private Date endTime; + + /** + * 支付状态（0-未支付；1-支付完成；2-无需支付; 3-待补缴） + */ + private String payStatus; + + /** + * 占桩订单金额 + */ + private BigDecimal orderAmount; + + /** + * 充电桩编号 + */ + private String pileSn; + + /** + * 充电桩枪口号 + */ + private String connectorCode; + + /** + * 充电桩枪口编号 + */ + private String pileConnectorCode; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 创建人 + */ + private String createBy; + + /** + * 修改时间 + */ + private Date updateTime; + + /** + * 修改人 + */ + private String updateBy; + + /** + * 删除标识（0-否；1-是） + */ + private String delFlag; + +} diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderPileOccupyMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderPileOccupyMapper.java index 9fa81104f..966684d0a 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderPileOccupyMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderPileOccupyMapper.java @@ -1,6 +1,7 @@ package com.jsowell.pile.mapper; import com.jsowell.pile.domain.OrderPileOccupy; +import com.jsowell.pile.dto.OrderPileOccupyDTO; import com.jsowell.pile.dto.QueryOccupyOrderDTO; import com.jsowell.pile.vo.uniapp.OccupyOrderDetailVO; import com.jsowell.pile.vo.uniapp.OrderPileOccupyVO; @@ -127,10 +128,10 @@ public interface OrderPileOccupyMapper { /** * 查询占桩订单列表 * - * @param orderPileOccupy 占桩订单 + * @param dto 占桩订单 * @return 占桩订单集合 */ - public List getOrderPileOccupyList(OrderPileOccupy orderPileOccupy); + public List getOrderPileOccupyList(@Param("dto") OrderPileOccupyDTO dto); /** * 使该笔订单免费 diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderPileOccupyService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderPileOccupyService.java index 6520c2aa1..29514642b 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderPileOccupyService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderPileOccupyService.java @@ -49,7 +49,7 @@ public interface OrderPileOccupyService{ * @param orderPileOccupy 占桩订单 * @return 占桩订单集合 */ - List getOrderPileOccupyList(OrderPileOccupy orderPileOccupy); + // List getOrderPileOccupyList(OrderPileOccupy orderPileOccupy); List queryOccupyOrderList(QueryOccupyOrderDTO dto); @@ -120,4 +120,11 @@ public interface OrderPileOccupyService{ int updateOrderInfoForWeb(MakeOrderFreeDTO dto); void closeOccupyPileOrder(String pileSn, String connectorCode); + + /** + * 查询占桩订单列表(带权限校验) + * @param dto + * @return + */ + List getOrderPileOccupyListWithAuth(OrderPileOccupyDTO dto); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java index 81da9d760..119900aeb 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java @@ -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 getOrderPileOccupyList(OrderPileOccupy orderPileOccupy) { - return orderPileOccupyMapper.getOrderPileOccupyList(orderPileOccupy); + /** + * 获取占桩订单列表 + * @param dto 占桩订单 + * @return + */ + public List 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); } /** diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderPileOccupyMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderPileOccupyMapper.xml index bc8d77532..9d50a8a2b 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderPileOccupyMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderPileOccupyMapper.xml @@ -997,16 +997,30 @@ order_pile_occupy t1 JOIN pile_station_info t2 ON t1.station_id = t2.id AND t1.del_flag = '0' + JOIN pile_merchant_info t3 on t2.merchant_id = t3.id and t2.del_flag = '0' - and t1.occupy_code = #{occupyCode} - and t1.member_id = #{memberId} - and t1.station_id = #{stationId} - and t1.plate_number = #{plateNumber} - and t1.status = #{status} - and t1.start_time = #{startTime} - and t1.order_amount = #{orderAmount} - and t1.pile_sn = #{pileSn} - and t1.pile_connector_code = #{pileConnectorCode} + + + and t3.dept_id in + + #{merchantDeptId} + + + + and t2.dept_id in + + #{stationDeptId} + + + and t1.occupy_code = #{dto.occupyCode} + and t1.member_id = #{dto.memberId} + and t1.station_id = #{dto.stationId} + and t1.plate_number = #{dto.plateNumber} + and t1.status = #{dto.status} + and t1.start_time = #{dto.startTime} + and t1.order_amount = #{dto.orderAmount} + and t1.pile_sn = #{dto.pileSn} + and t1.pile_connector_code = #{dto.pileConnectorCode} order by t1.create_time desc diff --git a/jsowell-ui/src/views/pile/card/index.vue b/jsowell-ui/src/views/pile/card/index.vue index 3876628e8..a332bc96c 100644 --- a/jsowell-ui/src/views/pile/card/index.vue +++ b/jsowell-ui/src/views/pile/card/index.vue @@ -154,7 +154,7 @@ - +