From 9783769b462d2a38c421de1d023f300393744c1d Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Mon, 7 Aug 2023 16:53:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=A0=E6=A1=A9=E8=AE=A2=E5=8D=95=E8=A1=A8?= =?UTF-8?q?=20=E5=AE=9E=E4=BD=93=E7=B1=BBupdate?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jsowell/common/util/id/IdUtils.java | 2 +- .../jsowell/pile/dto/QueryOccupyOrderDTO.java | 19 ++++++++ .../pile/mapper/OrderPileOccupyMapper.java | 5 ++ .../pile/service/OrderPileOccupyService.java | 5 ++ .../impl/OrderBasicInfoServiceImpl.java | 2 +- .../impl/OrderPileOccupyServiceImpl.java | 46 +++++++++++++++++++ .../mapper/pile/OrderPileOccupyMapper.xml | 24 ++++++++++ 7 files changed, 101 insertions(+), 2 deletions(-) create mode 100644 jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOccupyOrderDTO.java diff --git a/jsowell-common/src/main/java/com/jsowell/common/util/id/IdUtils.java b/jsowell-common/src/main/java/com/jsowell/common/util/id/IdUtils.java index 9b25d3cf0..081ef193b 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/util/id/IdUtils.java +++ b/jsowell-common/src/main/java/com/jsowell/common/util/id/IdUtils.java @@ -92,7 +92,7 @@ public class IdUtils { id /= 10; } // Integer num = Integer.parseInt(id + ""); - return "C" + id; + return String.valueOf(id); } /** diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOccupyOrderDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOccupyOrderDTO.java new file mode 100644 index 000000000..67382d2f9 --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOccupyOrderDTO.java @@ -0,0 +1,19 @@ +package com.jsowell.pile.dto; + +import lombok.*; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class QueryOccupyOrderDTO { + // 充电桩编号 + private String pileSn; + + // 会员id + private String memberId; + + // 充电桩枪口编号 + private String pileConnectorCode; +} 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 d955cff8a..e149e41b2 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.QueryOccupyOrderDTO; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -63,4 +64,8 @@ public interface OrderPileOccupyMapper { int updateBatchSelective(List list); int batchInsert(@Param("list") List list); + + OrderPileOccupy queryByOccupyCode(@Param("occupyCode") String occupyCode); + + List queryOccupyOrderList(@Param("dto") QueryOccupyOrderDTO dto); } \ No newline at end of file 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 5ee234c15..d51332c88 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 @@ -1,6 +1,7 @@ package com.jsowell.pile.service; import com.jsowell.pile.domain.OrderPileOccupy; +import com.jsowell.pile.dto.QueryOccupyOrderDTO; import java.util.List; public interface OrderPileOccupyService{ @@ -26,6 +27,10 @@ public interface OrderPileOccupyService{ int batchInsert(List list); + OrderPileOccupy queryByOccupyCode(String occupyCode); + + List queryOccupyOrderList(QueryOccupyOrderDTO dto); + /** * 生成占桩订单 */ diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index e393c7a64..527842e72 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -1327,7 +1327,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { */ private String generateNewOrderCode() { while (true) { - String orderCode = IdUtils.getOrderCode(); + String orderCode = "C" + IdUtils.getOrderCode(); // 通过orderCode查询是否已经存在 OrderBasicInfo orderBasicInfo = getOrderInfoByOrderCode(orderCode); if (orderBasicInfo == null) { 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 317ee8a33..1a6f761b9 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 @@ -1,12 +1,19 @@ package com.jsowell.pile.service.impl; +import com.jsowell.common.constant.Constants; +import com.jsowell.common.util.DateUtils; +import com.jsowell.common.util.id.IdUtils; import com.jsowell.pile.domain.OrderPileOccupy; +import com.jsowell.pile.dto.QueryOccupyOrderDTO; import com.jsowell.pile.mapper.OrderPileOccupyMapper; import com.jsowell.pile.service.OrderPileOccupyService; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.List; + +@Slf4j @Service public class OrderPileOccupyServiceImpl implements OrderPileOccupyService{ @@ -68,6 +75,26 @@ public class OrderPileOccupyServiceImpl implements OrderPileOccupyService{ return orderPileOccupyMapper.batchInsert(list); } + /** + * 根据占桩订单编号查询占桩订单 + * @param occupyCode 占桩订单编号 + * @return + */ + @Override + public OrderPileOccupy queryByOccupyCode(String occupyCode) { + return orderPileOccupyMapper.queryByOccupyCode(occupyCode); + } + + /** + * 查询占桩订单列表 + * @param dto + * @return + */ + @Override + public List queryOccupyOrderList(QueryOccupyOrderDTO dto) { + return orderPileOccupyMapper.queryOccupyOrderList(dto); + } + /** * 生成占桩订单 * 在会员操作降地锁后，就生成占桩订单 @@ -77,11 +104,30 @@ public class OrderPileOccupyServiceImpl implements OrderPileOccupyService{ */ @Override public void generateOccupyPileOrder(String memberId, String pileSn, String connectorCode) { + // 创建占桩订单 OrderPileOccupy orderPileOccupy = new OrderPileOccupy(); + String occupyCode = "OP" + IdUtils.getOrderCode(); + orderPileOccupy.setOccupyCode(occupyCode); orderPileOccupy.setMemberId(memberId); + orderPileOccupy.setStatus(Constants.ZERO); orderPileOccupy.setPileSn(pileSn); orderPileOccupy.setConnectorCode(connectorCode); orderPileOccupy.setPileConnectorCode(pileSn + connectorCode); + orderPileOccupy.setStartTime(DateUtils.getNowDate()); + orderPileOccupyMapper.insertOrUpdate(orderPileOccupy); + } + + /** + * 占桩订单停止计费 + */ + public void stopOccupyPileOrder(String occupyCode) { + OrderPileOccupy orderPileOccupy = queryByOccupyCode(occupyCode); + if (orderPileOccupy == null) { + log.error("根据占桩订单编号:{}, 查询为空", occupyCode); + return; + } + orderPileOccupy.setEndTime(DateUtils.getNowDate()); + orderPileOccupyMapper.insertOrUpdate(orderPileOccupy); } } diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderPileOccupyMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderPileOccupyMapper.xml index b0fc1ab5c..d12909dce 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderPileOccupyMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderPileOccupyMapper.xml @@ -662,4 +662,28 @@ + + + + \ No newline at end of file