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 958b68eb4..239191715 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 @@ -24,7 +24,7 @@ public class OrderPileOccupy { private String occupyCode; /** - * 状态(0-占桩中;1-待支付;2-无需支付;3;订单完成) + * 状态(0-占桩中;1-订单完成) */ private String status; @@ -53,6 +53,11 @@ public class OrderPileOccupy { */ private Date endTime; + /** + * 支付状态(0-未支付;1-支付完成;2-无需支付) + */ + private String payStatus; + /** * 充电桩编号 */ 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 1a6f761b9..b3c7ad841 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 @@ -109,7 +109,8 @@ public class OrderPileOccupyServiceImpl implements OrderPileOccupyService{ String occupyCode = "OP" + IdUtils.getOrderCode(); orderPileOccupy.setOccupyCode(occupyCode); orderPileOccupy.setMemberId(memberId); - orderPileOccupy.setStatus(Constants.ZERO); + orderPileOccupy.setStatus(Constants.ZERO); // 占桩中 + orderPileOccupy.setPayStatus(Constants.ZERO); // 未支付 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 d12909dce..c009206cb 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderPileOccupyMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderPileOccupyMapper.xml @@ -12,6 +12,7 @@ + @@ -24,8 +25,8 @@ 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 + pay_status, pile_sn, connector_code, pile_connector_code, create_time, create_by, + update_time, update_by, del_flag