From 7dd0b1cdfc29876963d4953e3de1b720256c4c14 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Tue, 8 Aug 2023 08:43:50 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E7=94=9F=E6=88=90=E5=8D=A0=E6=A1=A9?= =?UTF-8?q?=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/test/java/SpringBootTestController.java | 17 +++++++++++++++++ .../pile/service/OrderPileOccupyService.java | 2 ++ .../impl/OrderPileOccupyServiceImpl.java | 3 +++ .../mapper/pile/OrderPileOccupyMapper.xml | 6 ------ 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/jsowell-admin/src/test/java/SpringBootTestController.java b/jsowell-admin/src/test/java/SpringBootTestController.java index fe1b336e1..72e33308f 100644 --- a/jsowell-admin/src/test/java/SpringBootTestController.java +++ b/jsowell-admin/src/test/java/SpringBootTestController.java @@ -189,6 +189,23 @@ public class SpringBootTestController { @Autowired private ClearingWithdrawInfoService clearingWithdrawInfoService; + @Autowired + private OrderPileOccupyService orderPileOccupyService; + + @Test + public void testGenerateOccupyPileOrder() { + String memberId = "67569684"; + String pileSn = "88230000000135"; + String connectorCode = "01"; + orderPileOccupyService.generateOccupyPileOrder(memberId, pileSn, connectorCode); + } + + @Test + public void testStopOccupyPileOrder() { + String occupyCode = "OP82399061445"; + orderPileOccupyService.stopOccupyPileOrder(occupyCode); + } + @Test public void testCreateConfirmReverse() throws BaseAdaPayException { List list = Lists.newArrayList(); 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 d51332c88..e260e8726 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 @@ -35,4 +35,6 @@ public interface OrderPileOccupyService{ * 生成占桩订单 */ void generateOccupyPileOrder(String memberId, String pileSn, String connectorCode); + + void stopOccupyPileOrder(String occupyCode); } 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 b3c7ad841..ff5075558 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,6 +1,7 @@ package com.jsowell.pile.service.impl; import com.jsowell.common.constant.Constants; +import com.jsowell.common.enums.DelFlagEnum; import com.jsowell.common.util.DateUtils; import com.jsowell.common.util.id.IdUtils; import com.jsowell.pile.domain.OrderPileOccupy; @@ -115,12 +116,14 @@ public class OrderPileOccupyServiceImpl implements OrderPileOccupyService{ orderPileOccupy.setConnectorCode(connectorCode); orderPileOccupy.setPileConnectorCode(pileSn + connectorCode); orderPileOccupy.setStartTime(DateUtils.getNowDate()); + orderPileOccupy.setDelFlag(DelFlagEnum.NORMAL.getValue()); orderPileOccupyMapper.insertOrUpdate(orderPileOccupy); } /** * 占桩订单停止计费 */ + @Override public void stopOccupyPileOrder(String occupyCode) { OrderPileOccupy orderPileOccupy = queryByOccupyCode(occupyCode); if (orderPileOccupy == null) { diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderPileOccupyMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderPileOccupyMapper.xml index c009206cb..6e7bb5ab2 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderPileOccupyMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderPileOccupyMapper.xml @@ -481,9 +481,7 @@ pile_sn, connector_code, pile_connector_code, - create_time, create_by, - update_time, update_by, del_flag, @@ -503,9 +501,7 @@ #{pileSn,jdbcType=VARCHAR}, #{connectorCode,jdbcType=VARCHAR}, #{pileConnectorCode,jdbcType=VARCHAR}, - #{createTime,jdbcType=TIMESTAMP}, #{createBy,jdbcType=VARCHAR}, - #{updateTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{delFlag,jdbcType=CHAR}, @@ -525,9 +521,7 @@ pile_sn = #{pileSn,jdbcType=VARCHAR}, connector_code = #{connectorCode,jdbcType=VARCHAR}, pile_connector_code = #{pileConnectorCode,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=TIMESTAMP}, create_by = #{createBy,jdbcType=VARCHAR}, - update_time = #{updateTime,jdbcType=TIMESTAMP}, update_by = #{updateBy,jdbcType=VARCHAR}, del_flag = #{delFlag,jdbcType=CHAR},