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 12c2edae7..251196e1c 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
@@ -1,15 +1,12 @@
package com.jsowell.pile.domain;
+import lombok.*;
+
import java.util.Date;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
/**
- * 占桩订单表
- */
+ * 占桩订单表
+ */
@Getter
@Setter
@Builder
@@ -17,62 +14,77 @@ import lombok.Setter;
@NoArgsConstructor
public class OrderPileOccupy {
/**
- * 主键
- */
+ * 主键
+ */
private Integer id;
/**
- * 状态(0-占桩中;1-待支付;2-无需支付;3;订单完成)
- */
+ * 状态(0-占桩中;1-待支付;2-无需支付;3;订单完成)
+ */
private String status;
/**
- * 订单号
- */
- private String orderCode;
-
- /**
- * 交易流水号
- */
- private String transactionCode;
-
- /**
- * 会员id
- */
+ * 会员id
+ */
private String memberId;
/**
- * 开始时间
- */
+ * 订单号
+ */
+ private String orderCode;
+
+ /**
+ * 交易流水号
+ */
+ private String transactionCode;
+
+ /**
+ * 占桩开始时间
+ */
private Date startTime;
/**
- * 结束时间
- */
+ * 占桩结束时间
+ */
private Date endTime;
/**
- * 创建时间
- */
+ * 充电桩编号
+ */
+ private String pileSn;
+
+ /**
+ * 充电桩枪口号
+ */
+ private String connectorCode;
+
+ /**
+ * 充电桩枪口编号
+ */
+ private String pileConnectorCode;
+
+ /**
+ * 创建时间
+ */
private Date createTime;
/**
- * 创建人
- */
+ * 创建人
+ */
private String createBy;
/**
- * 修改时间
- */
+ * 修改时间
+ */
private Date updateTime;
/**
- * 修改人
- */
+ * 修改人
+ */
private String updateBy;
/**
- * 删除标识(0-否;1-是)
- */
+ * 删除标识(0-否;1-是)
+ */
private String delFlag;
}
\ No newline at end of file
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 d0021558f..d955cff8a 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,12 +1,14 @@
package com.jsowell.pile.mapper;
import com.jsowell.pile.domain.OrderPileOccupy;
-import java.util.List;
import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
public interface OrderPileOccupyMapper {
/**
* delete by primary key
+ *
* @param id primaryKey
* @return deleteCount
*/
@@ -14,6 +16,7 @@ public interface OrderPileOccupyMapper {
/**
* insert record to table
+ *
* @param record the record
* @return insert count
*/
@@ -25,6 +28,7 @@ public interface OrderPileOccupyMapper {
/**
* insert record to table selective
+ *
* @param record the record
* @return insert count
*/
@@ -32,6 +36,7 @@ public interface OrderPileOccupyMapper {
/**
* select by primary key
+ *
* @param id primary key
* @return object by primary key
*/
@@ -39,6 +44,7 @@ public interface OrderPileOccupyMapper {
/**
* update record selective
+ *
* @param record the updated record
* @return update count
*/
@@ -46,6 +52,7 @@ public interface OrderPileOccupyMapper {
/**
* update record
+ *
* @param record the updated record
* @return update count
*/
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 49ac32385..9dafc91d2 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,10 +1,9 @@
package com.jsowell.pile.service;
-import java.util.List;
import com.jsowell.pile.domain.OrderPileOccupy;
+
+import java.util.List;
public interface OrderPileOccupyService{
-
-
int deleteByPrimaryKey(Integer id);
int insert(OrderPileOccupy record);
diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderPileOccupyMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderPileOccupyMapper.xml
index e11f77066..d0e21afad 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/OrderPileOccupyMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/OrderPileOccupyMapper.xml
@@ -6,11 +6,14 @@
+
-
+
+
+
@@ -19,8 +22,9 @@
- id, `status`, order_code, transaction_code, member_id, start_time, end_time, create_time,
- create_by, update_time, update_by, del_flag
+ 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