新增 占桩订单相关接口

jsowell-pile/src/main/java/com/jsowell/pile/dto/GenerateOccupyOrderDTO.java

@@ -1,7 +1,24 @@
-package com.jsowell.pile.dto;/**
- * TODO
+package com.jsowell.pile.dto;
+
+import lombok.Data;
+
+/**
+ * 生成占桩订单DTO
  *
+ * @author Lemon
  * @Date 2023/8/18 9:00
- * @author  Lemon 
- */public class GenerateOccupyOrderDTO {
+ */
+@Data
+public class GenerateOccupyOrderDTO {
+    private String memberId;
+
+    /**
+     * 桩号
+     */
+    private String pileSn;
+
+    /**
+     * 枪口号
+     */
+    private String connectorCode;
 }

jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderPileOccupyMapper.java

@@ -2,6 +2,7 @@ package com.jsowell.pile.mapper;
 
 import com.jsowell.pile.domain.OrderPileOccupy;
 import com.jsowell.pile.dto.QueryOccupyOrderDTO;
+import com.jsowell.pile.vo.uniapp.OrderPileOccupyVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -83,4 +84,11 @@ public interface OrderPileOccupyMapper {
      * @return
      */
     List<OrderPileOccupy> queryUnPayOrderByMemberId(@Param("memberId") String memberId);
+
+    /**
+     * 查询占桩订单列表
+     * @param memberId
+     * @return
+     */
+    List<OrderPileOccupyVO> getOccupyOrderInfo(String memberId);
 }

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

@@ -1,7 +1,9 @@
 package com.jsowell.pile.service;
 
 import com.jsowell.pile.domain.OrderPileOccupy;
+import com.jsowell.pile.dto.GenerateOccupyOrderDTO;
 import com.jsowell.pile.dto.QueryOccupyOrderDTO;
+import com.jsowell.pile.vo.uniapp.OrderPileOccupyVO;
 
 import java.util.List;
 public interface OrderPileOccupyService{
@@ -34,7 +36,7 @@ public interface OrderPileOccupyService{
     /**
      * 生成占桩订单
      */
-    void generateOccupyPileOrder(String memberId, String pileSn, String connectorCode);
+    String generateOccupyPileOrder(GenerateOccupyOrderDTO dto);
 
     /**
      * 停止并计算占桩订单
@@ -49,4 +51,11 @@ public interface OrderPileOccupyService{
      * @return
      */
     List<OrderPileOccupy> queryUnPayOrderByMemberId(String memberId);
+
+    /**
+     * 查询占桩订单列表
+     * @param memberId
+     * @return
+     */
+    List<OrderPileOccupyVO> getOccupyOrderInfo(String memberId);
 }

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java

@@ -2,10 +2,14 @@ package com.jsowell.pile.service.impl;
 
 import com.jsowell.common.constant.Constants;
 import com.jsowell.common.enums.DelFlagEnum;
+import com.jsowell.common.enums.uniapp.OrderPileOccupyPayStatusEnum;
+import com.jsowell.common.enums.uniapp.OrderPileOccupyStatusEnum;
 import com.jsowell.common.util.DateUtils;
+import com.jsowell.common.util.PageUtils;
 import com.jsowell.common.util.StringUtils;
 import com.jsowell.common.util.id.IdUtils;
 import com.jsowell.pile.domain.OrderPileOccupy;
+import com.jsowell.pile.dto.GenerateOccupyOrderDTO;
 import com.jsowell.pile.dto.QueryOccupyOrderDTO;
 import com.jsowell.pile.dto.QueryOrderDTO;
 import com.jsowell.pile.mapper.OrderPileOccupyMapper;
@@ -14,6 +18,7 @@ import com.jsowell.pile.service.IPileBasicInfoService;
 import com.jsowell.pile.service.IPileBillingTemplateService;
 import com.jsowell.pile.service.OrderPileOccupyService;
 import com.jsowell.pile.vo.base.PileInfoVO;
+import com.jsowell.pile.vo.uniapp.OrderPileOccupyVO;
 import com.jsowell.pile.vo.web.BillingTemplateVO;
 import com.jsowell.pile.vo.web.OrderListVO;
 import lombok.extern.slf4j.Slf4j;
@@ -121,12 +126,13 @@ public class OrderPileOccupyServiceImpl implements OrderPileOccupyService{
     /**
      * 生成占桩订单
      * 在会员操作降地锁后，就生成占桩订单
-     * @param memberId 会员id
-     * @param pileSn 充电桩编号
-     * @param connectorCode 充电桩枪口号
+     * @param dto 会员id  充电桩编号  充电桩枪口号
      */
     @Override
-    public void generateOccupyPileOrder(String memberId, String pileSn, String connectorCode) {
+    public String generateOccupyPileOrder(GenerateOccupyOrderDTO dto) {
+        String memberId = dto.getMemberId();
+        String pileSn = dto.getPileSn();
+        String connectorCode = dto.getConnectorCode();
         // 创建占桩订单
         OrderPileOccupy orderPileOccupy = new OrderPileOccupy();
         String occupyCode = "OP" + IdUtils.getOrderCode();
@@ -144,6 +150,8 @@ public class OrderPileOccupyServiceImpl implements OrderPileOccupyService{
         orderPileOccupy.setStartTime(DateUtils.getNowDate());
         orderPileOccupy.setDelFlag(DelFlagEnum.NORMAL.getValue());
         orderPileOccupyMapper.insertSelective(orderPileOccupy);
+
+        return orderPileOccupy.getOccupyCode();
     }
 
     /**
@@ -260,5 +268,24 @@ public class OrderPileOccupyServiceImpl implements OrderPileOccupyService{
         return orderPileOccupyMapper.queryUnPayOrderByMemberId(memberId);
     }
 
+    /**
+     * 查询占桩订单列表
+     * @param memberId
+     * @return
+     */
+    @Override
+    public List<OrderPileOccupyVO> getOccupyOrderInfo(String memberId) {
+        // 分页
+        PageUtils.startPage();
+        List<OrderPileOccupyVO> list = orderPileOccupyMapper.getOccupyOrderInfo(memberId);
+        for (OrderPileOccupyVO orderPileOccupyVO : list) {
+            // 订单状态
+            orderPileOccupyVO.setStatus(OrderPileOccupyStatusEnum.getValueByCode(orderPileOccupyVO.getStatus()));
+            // 支付状态
+            orderPileOccupyVO.setPayStatus(OrderPileOccupyPayStatusEnum.getValueByCode(orderPileOccupyVO.getPayStatus()));
+        }
+        return list;
+    }
+
 
 }

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java

@@ -357,7 +357,7 @@ public class PileBillingTemplateServiceImpl implements IPileBillingTemplateServi
                 }
             }
         }
-        log.info("通过站点id查询当前时间的收费详情 stationId:{}, result:{}", stationId, JSON.toJSONString(result));
+        // log.info("通过站点id查询当前时间的收费详情 stationId:{}, result:{}", stationId, JSON.toJSONString(result));
         return result;
     }
 

jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/OrderPileOccupyVO.java

@@ -0,0 +1,53 @@
+package com.jsowell.pile.vo.uniapp;
+
+import lombok.Data;
+
+/**
+ * 占桩订单列表VO
+ *
+ * @author Lemon
+ * @Date 2023/8/18 9:34
+ */
+@Data
+public class OrderPileOccupyVO {
+    /**
+     * 占桩订单编号
+     */
+    private String occupyCode;
+
+    /**
+     * 状态（0-占桩中；1-订单完成; 2-订单挂起）
+     */
+    private String status;
+
+    /**
+     * 站点id
+     */
+    private String stationId;
+
+    /**
+     * 站点名称
+     */
+    private String stationName;
+
+    /**
+     * 占桩开始时间
+     */
+    private String startTime;
+
+    /**
+     * 占桩结束时间
+     */
+    private String endTime;
+
+    /**
+     * 支付状态（0-未支付；1-支付完成；2-无需支付）
+     */
+    private String payStatus;
+
+    /**
+     * 占桩订单金额
+     */
+    private String orderAmount;
+
+}