diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderPileOccupy.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderPileOccupy.java index 251196e1c..958b68eb4 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderPileOccupy.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderPileOccupy.java @@ -18,6 +18,11 @@ public class OrderPileOccupy { */ private Integer id; + /** + * 占桩订单编号 + */ + private String occupyCode; + /** * 状态(0-占桩中;1-待支付;2-无需支付;3;订单完成) */ 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 9dafc91d2..5ee234c15 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 @@ -26,4 +26,8 @@ public interface OrderPileOccupyService{ int batchInsert(List list); + /** + * 生成占桩订单 + */ + void generateOccupyPileOrder(String memberId, String pileSn, String connectorCode); } 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 76325e846..317ee8a33 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,11 +1,12 @@ package com.jsowell.pile.service.impl; +import com.jsowell.pile.domain.OrderPileOccupy; +import com.jsowell.pile.mapper.OrderPileOccupyMapper; +import com.jsowell.pile.service.OrderPileOccupyService; import org.springframework.stereotype.Service; + import javax.annotation.Resource; import java.util.List; -import com.jsowell.pile.mapper.OrderPileOccupyMapper; -import com.jsowell.pile.domain.OrderPileOccupy; -import com.jsowell.pile.service.OrderPileOccupyService; @Service public class OrderPileOccupyServiceImpl implements OrderPileOccupyService{ @@ -67,4 +68,20 @@ public class OrderPileOccupyServiceImpl implements OrderPileOccupyService{ return orderPileOccupyMapper.batchInsert(list); } + /** + * 生成占桩订单 + * 在会员操作降地锁后,就生成占桩订单 + * @param memberId 会员id + * @param pileSn 充电桩编号 + * @param connectorCode 充电桩枪口号 + */ + @Override + public void generateOccupyPileOrder(String memberId, String pileSn, String connectorCode) { + OrderPileOccupy orderPileOccupy = new OrderPileOccupy(); + orderPileOccupy.setMemberId(memberId); + orderPileOccupy.setPileSn(pileSn); + orderPileOccupy.setConnectorCode(connectorCode); + orderPileOccupy.setPileConnectorCode(pileSn + connectorCode); + } + } diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderPileOccupyMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderPileOccupyMapper.xml index d0e21afad..b0fc1ab5c 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderPileOccupyMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderPileOccupyMapper.xml @@ -5,6 +5,7 @@ + @@ -22,9 +23,9 @@ - id, `status`, member_id, order_code, transaction_code, start_time, end_time, pile_sn, - connector_code, pile_connector_code, create_time, create_by, update_time, update_by, - del_flag + id, occupy_code, `status`, member_id, order_code, transaction_code, start_time, end_time, + pile_sn, connector_code, pile_connector_code, create_time, create_by, update_time, + update_by, del_flag