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

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;
+
+}

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<OccupyOrderVO> getOrderPileOccupyList(OrderPileOccupy orderPileOccupy);
+    public List<OccupyOrderVO> getOrderPileOccupyList(@Param("dto") OrderPileOccupyDTO dto);
 
     /**
      * 使该笔订单免费

jsowell-pile/src/main/java/com/jsowell/pile/service/OrderPileOccupyService.java

@@ -49,7 +49,7 @@ public interface OrderPileOccupyService{
      * @param orderPileOccupy 占桩订单
      * @return 占桩订单集合
      */
-    List<OccupyOrderVO> getOrderPileOccupyList(OrderPileOccupy orderPileOccupy);
+    // List<OccupyOrderVO> getOrderPileOccupyList(OrderPileOccupy orderPileOccupy);
 
     List<OrderPileOccupy> queryOccupyOrderList(QueryOccupyOrderDTO dto);
 
@@ -120,4 +120,11 @@ public interface OrderPileOccupyService{
     int updateOrderInfoForWeb(MakeOrderFreeDTO dto);
 
     void closeOccupyPileOrder(String pileSn, String connectorCode);
+
+    /**
+     * 查询占桩订单列表(带权限校验)
+     * @param dto
+     * @return
+     */
+    List<OccupyOrderVO> getOrderPileOccupyListWithAuth(OrderPileOccupyDTO dto);
 }

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<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);
     }
 
     /**