最新逻辑 （超过1小时半小时收半小时钱、多余的收一小时钱，没有宽限期） 增加篮球入场视图，显示订单记录信息。

entity/src/main/java/com/enums/EnterOrderStatusEnum.java

@@ -0,0 +1,43 @@
+package com.enums;
+
+/**
+ * Enum - 入场标志
+ *
+ */
+public enum EnterOrderStatusEnum {
+    USING(0, "使用中"),
+    PAYING(1, "待结算"),
+    OVER(2, "已结算");
+    public Integer value;
+    public String name;
+
+    EnterOrderStatusEnum(Integer value, String name) {
+        this.value = value;
+        this.name = name;
+    }
+
+    public Integer getValue() {
+        return value;
+    }
+
+    public void setValue(Integer value) {
+        this.value = value;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public static EnterOrderStatusEnum getByValue(Integer value) {
+        for (EnterOrderStatusEnum type : EnterOrderStatusEnum.values()) {
+            if (type.value.equals(value)) {
+                return type;
+            }
+        }
+        return null;
+    }
+}

entity/src/main/java/com/sv/dto/api/MemberEnterOrderDTO.java

@@ -0,0 +1,526 @@
+package com.sv.dto.api;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * DTO - 用户预约的场馆课程票号
+ *
+ * @author lihong
+ * @since 2018-08-06
+ */
+public class MemberEnterOrderDTO implements Serializable {
+
+
+    /**
+     *
+     */
+    private Integer id;
+
+    /**
+     * 场馆类型
+     */
+    private Integer veneuType;
+
+    /**
+     * 场馆ID
+     */
+    private Integer venueId;
+
+    /**
+     * 课程ID
+     */
+    private Integer lessonId;
+
+    /**
+     * 用户ID
+     */
+    private Integer memberId;
+
+    /**
+     * 预约课程支付订单号
+     */
+    private String orderSn;
+
+    /**
+     * 入场支付方式
+     */
+    private Integer payType;
+
+    /**
+     * 用户会员卡ID
+     */
+    private Integer memberCardId;
+
+    /**
+     * 支付状态
+     */
+    private Integer paying;
+
+    /**
+     * 使用状态
+     */
+    private Integer status;
+
+    /**
+     * 品台来源ID
+     */
+    private Integer platformId;
+
+    /**
+     * 创建者编号
+     */
+    private Integer createdId;
+
+    /**
+     * 创建者编号
+     */
+    private Integer modifiedId;
+
+    /**
+     * 创建时间
+     */
+    private Date createdTime;
+
+    /**
+     * 更新时间
+     */
+    private Date modifiedTime;
+
+    /**
+     * 删除标识位
+     *
+     * @see com.ydd.framework.core.entity.enums.DeletedEnum
+     */
+    private Integer deleted;
+
+    /**
+     * 课程名
+     */
+    private String lessonName;
+
+    /**
+     * 课程开始日期
+     */
+//    @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
+    private Date lastEnter;
+
+    /**
+     * 课程开始时间
+     */
+//    @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
+//    @JsonSerialize(using= LocalTimeSerializer.class)
+    private Date startTime;
+
+    /**
+     * 课程结束时间 12
+     */
+//    @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
+//    @JsonSerialize(using= LocalTimeSerializer.class)
+    private Date endTime;
+
+    /**
+     * 课程价格
+     */
+    private BigDecimal price;
+
+    /**
+     * 课程图片
+     */
+    private String lessonImage;
+
+    /**
+     * 运动时长
+     */
+    private Integer lessonCount;
+
+    /**
+     * 场馆地址
+     */
+    private String address;
+
+    /**
+     * 场馆经度
+     */
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+    private String latitude;
+
+    /**
+     * 设置
+     *
+     * @param id
+     */
+    public void setId(Integer id){
+        this.id = id;
+    }
+
+    /**
+     * 获取
+     *
+     * @return
+     */
+    public Integer getId(){
+        return id;
+    }
+
+
+    /**
+     * 设置场馆类型
+     *
+     * @param veneuType 场馆类型
+     */
+    public void setVeneuType(Integer veneuType){
+        this.veneuType = veneuType;
+    }
+
+    /**
+     * 获取场馆类型
+     *
+     * @return 场馆类型
+     */
+    public Integer getVeneuType(){
+        return veneuType;
+    }
+
+
+    /**
+     * 设置场馆ID
+     *
+     * @param venueId 场馆ID
+     */
+    public void setVenueId(Integer venueId){
+        this.venueId = venueId;
+    }
+
+    /**
+     * 获取场馆ID
+     *
+     * @return 场馆ID
+     */
+    public Integer getVenueId(){
+        return venueId;
+    }
+
+    /**
+     * 设置课程ID
+     *
+     * @param lessonId 课程ID
+     */
+    public void setLessonId(Integer lessonId){
+        this.lessonId = lessonId;
+    }
+
+    /**
+     * 获取课程ID
+     *
+     * @return 课程ID
+     */
+    public Integer getLessonId(){
+        return lessonId;
+    }
+
+
+    /**
+     * 设置用户ID
+     *
+     * @param memberId 用户ID
+     */
+    public void setMemberId(Integer memberId){
+        this.memberId = memberId;
+    }
+
+    /**
+     * 获取用户ID
+     *
+     * @return 用户ID
+     */
+    public Integer getMemberId(){
+        return memberId;
+    }
+
+
+    /**
+     * 设置预约课程支付订单号
+     *
+     * @param orderSn 预约课程支付订单号
+     */
+    public void setOrderSn(String orderSn){
+        this.orderSn = orderSn;
+    }
+
+    /**
+     * 获取预约课程支付订单号
+     *
+     * @return 预约课程支付订单号
+     */
+    public String getOrderSn(){
+        return orderSn;
+    }
+
+
+    /**
+     * 设置入场支付方式
+     *
+     * @param payType 入场支付方式
+     */
+    public void setPayType(Integer payType){
+        this.payType = payType;
+    }
+
+    /**
+     * 获取入场支付方式
+     *
+     * @return 入场支付方式
+     */
+    public Integer getPayType(){
+        return payType;
+    }
+
+
+    /**
+     * 设置用户会员卡ID
+     *
+     * @param memberCardId 用户会员卡ID
+     */
+    public void setMemberCardId(Integer memberCardId){
+        this.memberCardId = memberCardId;
+    }
+
+    /**
+     * 获取用户会员卡ID
+     *
+     * @return 用户会员卡ID
+     */
+    public Integer getMemberCardId(){
+        return memberCardId;
+    }
+
+    public Integer getPaying() {
+        return paying;
+    }
+
+    public void setPaying(Integer paying) {
+        this.paying = paying;
+    }
+
+    /**
+     * 设置使用状态
+     *
+     * @see com.ydd.framework.core.entity.enums.StatusEnum
+     * @param status 使用状态
+     */
+    public void setStatus(Integer status){
+        this.status = status;
+    }
+
+    /**
+     * 获取使用状态
+     *
+     * @see com.ydd.framework.core.entity.enums.StatusEnum
+     * @return 使用状态
+     */
+    public Integer getStatus(){
+        return status;
+    }
+
+
+    /**
+     * 设置品台来源ID
+     *
+     * @param platformId 品台来源ID
+     */
+    public void setPlatformId(Integer platformId){
+        this.platformId = platformId;
+    }
+
+    /**
+     * 获取品台来源ID
+     *
+     * @return 品台来源ID
+     */
+    public Integer getPlatformId(){
+        return platformId;
+    }
+
+
+    /**
+     * 设置创建者编号
+     *
+     * @param createdId 创建者编号
+     */
+    public void setCreatedId(Integer createdId){
+        this.createdId = createdId;
+    }
+
+    /**
+     * 获取创建者编号
+     *
+     * @return 创建者编号
+     */
+    public Integer getCreatedId(){
+        return createdId;
+    }
+
+
+    /**
+     * 设置创建者编号
+     *
+     * @param modifiedId 创建者编号
+     */
+    public void setModifiedId(Integer modifiedId){
+        this.modifiedId = modifiedId;
+    }
+
+    /**
+     * 获取创建者编号
+     *
+     * @return 创建者编号
+     */
+    public Integer getModifiedId(){
+        return modifiedId;
+    }
+
+
+    /**
+     * 设置创建时间
+     *
+     * @param createdTime 创建时间
+     */
+    public void setCreatedTime(Date createdTime){
+        this.createdTime = createdTime;
+    }
+
+    /**
+     * 获取创建时间
+     *
+     * @return 创建时间
+     */
+    public Date getCreatedTime(){
+        return createdTime;
+    }
+
+
+    /**
+     * 设置更新时间
+     *
+     * @param modifiedTime 更新时间
+     */
+    public void setModifiedTime(Date modifiedTime){
+        this.modifiedTime = modifiedTime;
+    }
+
+    /**
+     * 获取更新时间
+     *
+     * @return 更新时间
+     */
+    public Date getModifiedTime(){
+        return modifiedTime;
+    }
+
+
+    /**
+     * 设置删除标识位
+     *
+     * @see com.ydd.framework.core.entity.enums.DeletedEnum
+     * @param deleted 删除标识位
+     */
+    public void setDeleted(Integer deleted){
+        this.deleted = deleted;
+    }
+
+    /**
+     * 获取删除标识位
+     *
+     * @see com.ydd.framework.core.entity.enums.DeletedEnum
+     * @return 删除标识位
+     */
+    public Integer getDeleted(){
+        return deleted;
+    }
+
+    public String getLessonName() {
+        return lessonName;
+    }
+
+    public void setLessonName(String lessonName) {
+        this.lessonName = lessonName;
+    }
+
+    public Date getLastEnter() {
+        return lastEnter;
+    }
+
+    public void setLastEnter(Date lastEnter) {
+        this.lastEnter = lastEnter;
+    }
+
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+
+    public BigDecimal getPrice() {
+        return price;
+    }
+
+    public void setPrice(BigDecimal price) {
+        this.price = price;
+    }
+
+    public String getLessonImage() {
+        return lessonImage;
+    }
+
+    public void setLessonImage(String lessonImage) {
+        this.lessonImage = lessonImage;
+    }
+
+    public Integer getLessonCount() {
+        return lessonCount;
+    }
+
+    public void setLessonCount(Integer lessonCount) {
+        this.lessonCount = lessonCount;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(String longitude) {
+        this.longitude = longitude;
+    }
+
+    public String getLatitude() {
+        return latitude;
+    }
+
+    public void setLatitude(String latitude) {
+        this.latitude = latitude;
+    }
+}

entity/src/main/java/com/sv/entity/BarcodeOrderTime.java

@@ -17,22 +17,35 @@ public class BarcodeOrderTime {
 
     private Date orderEnd;
 
+    /**
+     * 记录最后一次进门时间
+     */
+    private Date lastEnter;
+    /**
+     * 记录最后一次出门时间
+     */
+    private Date lastOut;
+
     private Integer status;
 
     /**
      * 入场 paying = 0  不需要退款
-     * 出场未结算 paying = 1 需要退款
+     * 出场未结算 paying = 1 需要退款 1 也可能待结算 就是出场需要补费用，区别在于 payMoney = -1
      */
     private Integer paying;
     /**
-     * 0- 按次
-     * 1- 按时
+     * 退款金额 -1 代表出场还需要交钱
      */
     private Integer payMoney;
 
     private String orderSn;
 
-    public BarcodeOrderTime(Integer id, Integer memberId, Integer venueId, Date createdTime, Date modifiedTime, Date orderStart, Date orderEnd, Integer status ,Integer paying, Integer payMoney, String orderSn) {
+    /**
+     * 追加付款订单号
+     */
+    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) {
         this.id = id;
         this.memberId = memberId;
         this.venueId = venueId;
@@ -44,6 +57,7 @@ public class BarcodeOrderTime {
         this.paying = paying;
         this.payMoney = payMoney;
         this.orderSn = orderSn;
+        this.orderAddSn = orderAddSn;
     }
 
     public BarcodeOrderTime() {
@@ -137,4 +151,28 @@ public class BarcodeOrderTime {
     public void setOrderSn(String orderSn) {
         this.orderSn = orderSn;
     }
+
+    public String getOrderAddSn() {
+        return orderAddSn;
+    }
+
+    public void setOrderAddSn(String orderAddSn) {
+        this.orderAddSn = orderAddSn;
+    }
+
+    public Date getLastEnter() {
+        return lastEnter;
+    }
+
+    public void setLastEnter(Date lastEnter) {
+        this.lastEnter = lastEnter;
+    }
+
+    public Date getLastOut() {
+        return lastOut;
+    }
+
+    public void setLastOut(Date lastOut) {
+        this.lastOut = lastOut;
+    }
 }