diff --git a/entity/src/main/java/com/sv/dto/api/MemberEnterOrderDTO.java b/entity/src/main/java/com/sv/dto/api/MemberEnterOrderDTO.java
index ff36930..e67243f 100644
--- a/entity/src/main/java/com/sv/dto/api/MemberEnterOrderDTO.java
+++ b/entity/src/main/java/com/sv/dto/api/MemberEnterOrderDTO.java
@@ -125,6 +125,11 @@ public class MemberEnterOrderDTO implements Serializable {
*/
private BigDecimal price;
+ /**
+ * 退款金额
+ */
+ private BigDecimal payMoney;
+
/**
* 课程图片
*/
@@ -523,4 +528,12 @@ public class MemberEnterOrderDTO implements Serializable {
public void setLatitude(String latitude) {
this.latitude = latitude;
}
+
+ public BigDecimal getPayMoney() {
+ return payMoney;
+ }
+
+ public void setPayMoney(BigDecimal payMoney) {
+ this.payMoney = payMoney;
+ }
}
diff --git a/entity/src/main/java/com/sv/entity/BarcodeOrderTime.java b/entity/src/main/java/com/sv/entity/BarcodeOrderTime.java
index 4d7d4dd..32ebe1b 100644
--- a/entity/src/main/java/com/sv/entity/BarcodeOrderTime.java
+++ b/entity/src/main/java/com/sv/entity/BarcodeOrderTime.java
@@ -45,7 +45,7 @@ public class BarcodeOrderTime {
*/
private String orderAddSn;
- public BarcodeOrderTime(Integer id, Integer memberId, Integer venueId, Date createdTime, Date modifiedTime, Date orderStart, Date orderEnd, Integer status ,Integer paying, Integer payMoney, String orderSn, String orderAddSn) {
+ public BarcodeOrderTime(Integer id, Integer memberId, Integer venueId, Date createdTime, Date modifiedTime, Date orderStart, Date orderEnd, Date lastEnter, Date lastOut, Integer status ,Integer paying, Integer payMoney, String orderSn, String orderAddSn) {
this.id = id;
this.memberId = memberId;
this.venueId = venueId;
@@ -53,6 +53,8 @@ public class BarcodeOrderTime {
this.modifiedTime = modifiedTime;
this.orderStart = orderStart;
this.orderEnd = orderEnd;
+ this.lastEnter = lastEnter;
+ this.lastOut = lastOut;
this.status = status;
this.paying = paying;
this.payMoney = payMoney;
diff --git a/service/src/main/java/com/sv/service/api/VenueEnterService.java b/service/src/main/java/com/sv/service/api/VenueEnterService.java
index a26fb7a..9c18c6e 100644
--- a/service/src/main/java/com/sv/service/api/VenueEnterService.java
+++ b/service/src/main/java/com/sv/service/api/VenueEnterService.java
@@ -311,12 +311,14 @@ public class VenueEnterService extends BaseServiceImpl {
endTime = new Date();
}
int diffMinute = DateUtilCard.diffMinute(memberEnterOrderDTO.getStartTime(), endTime);
+ Integer status = memberEnterOrderDTO.getStatus();
+ Integer paying = memberEnterOrderDTO.getPaying();
memberEnterOrderDTO.setStatus(EnterOrderStatusEnum.OVER.value);
- if (BarCodeStatusEnum.INIT.getValue() == memberEnterOrderDTO.getStatus()) {
- if (1 == memberEnterOrderDTO.getPaying()) {
+ if (BarCodeStatusEnum.INIT.getValue() == status) {
+ if (1 == paying) {
memberEnterOrderDTO.setStatus(EnterOrderStatusEnum.PAYING.value);
}
- if (0 == memberEnterOrderDTO.getPaying()){
+ if (0 == paying){
memberEnterOrderDTO.setStatus(EnterOrderStatusEnum.USING.value);
}
}
diff --git a/service/src/main/resources/mybatis/mapper/sv/BarcodeOrderTimeMapper.xml b/service/src/main/resources/mybatis/mapper/sv/BarcodeOrderTimeMapper.xml
index 290f396..384526a 100644
--- a/service/src/main/resources/mybatis/mapper/sv/BarcodeOrderTimeMapper.xml
+++ b/service/src/main/resources/mybatis/mapper/sv/BarcodeOrderTimeMapper.xml
@@ -20,7 +20,7 @@
- id, member_id, venue_id, created_time, modified_time, order_start, order_end, last_out, last_enter, status, paying, pay_money, order_sn,order_add_sn
+ id, member_id, venue_id, created_time, modified_time, order_start, order_end, last_enter, last_out, status, paying, pay_money, order_sn,order_add_sn