检验二维码是否使用，增加二维码失效功能 & fixbug 未超过半小时只收一半钱

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

@@ -0,0 +1,33 @@
+package com.sv.dto.api;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * DTO - 扫描完二维码
+ *
+ * @author limqsh
+ * @since 2024-01-14
+ */
+public class BarcodeDTO implements Serializable {
+
+    private boolean isUsed;
+
+    private Integer enterId;
+
+    public boolean isUsed() {
+        return isUsed;
+    }
+
+    public void setUsed(boolean used) {
+        isUsed = used;
+    }
+
+    public Integer getEnterId() {
+        return enterId;
+    }
+
+    public void setEnterId(Integer enterId) {
+        this.enterId = enterId;
+    }
+}

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

@@ -126,7 +126,7 @@ public class MemberEnterOrderDTO implements Serializable {
     private BigDecimal price;
 
     /**
-     * 退款金额
+     * 退款金额(总退款金额)
      */
     private BigDecimal payMoney;
 
@@ -156,155 +156,79 @@ public class MemberEnterOrderDTO implements Serializable {
     private String latitude;
 
     /**
-     * 设置
-     *
-     * @param id
+     * 新增后台查询字段
      */
-    public void setId(Integer id){
-        this.id = id;
-    }
+    private String nickname;
 
     /**
-     * 获取
-     *
-     * @return
+     * 新增用户电话号码
      */
-    public Integer getId(){
+    private String mobile;
+
+    public Integer getId() {
         return id;
     }
 
-
-    /**
-     * 设置场馆类型
-     *
-     * @param veneuType 场馆类型
-     */
-    public void setVeneuType(Integer veneuType){
-        this.veneuType = veneuType;
+    public void setId(Integer id) {
+        this.id = id;
     }
 
-    /**
-     * 获取场馆类型
-     *
-     * @return 场馆类型
-     */
-    public Integer getVeneuType(){
+    public Integer getVeneuType() {
         return veneuType;
     }
 
-
-    /**
-     * 设置场馆ID
-     *
-     * @param venueId 场馆ID
-     */
-    public void setVenueId(Integer venueId){
-        this.venueId = venueId;
+    public void setVeneuType(Integer veneuType) {
+        this.veneuType = veneuType;
     }
 
-    /**
-     * 获取场馆ID
-     *
-     * @return 场馆ID
-     */
-    public Integer getVenueId(){
+    public Integer getVenueId() {
         return venueId;
     }
 
-    /**
-     * 设置课程ID
-     *
-     * @param lessonId 课程ID
-     */
-    public void setLessonId(Integer lessonId){
-        this.lessonId = lessonId;
+    public void setVenueId(Integer venueId) {
+        this.venueId = venueId;
     }
 
-    /**
-     * 获取课程ID
-     *
-     * @return 课程ID
-     */
-    public Integer getLessonId(){
+    public Integer getLessonId() {
         return lessonId;
     }
 
-
-    /**
-     * 设置用户ID
-     *
-     * @param memberId 用户ID
-     */
-    public void setMemberId(Integer memberId){
-        this.memberId = memberId;
+    public void setLessonId(Integer lessonId) {
+        this.lessonId = lessonId;
     }
 
-    /**
-     * 获取用户ID
-     *
-     * @return 用户ID
-     */
-    public Integer getMemberId(){
+    public Integer getMemberId() {
         return memberId;
     }
 
-
-    /**
-     * 设置预约课程支付订单号
-     *
-     * @param orderSn 预约课程支付订单号
-     */
-    public void setOrderSn(String orderSn){
-        this.orderSn = orderSn;
+    public void setMemberId(Integer memberId) {
+        this.memberId = memberId;
     }
 
-    /**
-     * 获取预约课程支付订单号
-     *
-     * @return 预约课程支付订单号
-     */
-    public String getOrderSn(){
+    public String getOrderSn() {
         return orderSn;
     }
 
-
-    /**
-     * 设置入场支付方式
-     *
-     * @param payType 入场支付方式
-     */
-    public void setPayType(Integer payType){
-        this.payType = payType;
+    public void setOrderSn(String orderSn) {
+        this.orderSn = orderSn;
     }
 
-    /**
-     * 获取入场支付方式
-     *
-     * @return 入场支付方式
-     */
-    public Integer getPayType(){
+    public Integer getPayType() {
         return payType;
     }
 
-
-    /**
-     * 设置用户会员卡ID
-     *
-     * @param memberCardId 用户会员卡ID
-     */
-    public void setMemberCardId(Integer memberCardId){
-        this.memberCardId = memberCardId;
+    public void setPayType(Integer payType) {
+        this.payType = payType;
     }
 
-    /**
-     * 获取用户会员卡ID
-     *
-     * @return 用户会员卡ID
-     */
-    public Integer getMemberCardId(){
+    public Integer getMemberCardId() {
         return memberCardId;
     }
 
+    public void setMemberCardId(Integer memberCardId) {
+        this.memberCardId = memberCardId;
+    }
+
     public Integer getPaying() {
         return paying;
     }
@@ -313,140 +237,76 @@ public class MemberEnterOrderDTO implements Serializable {
         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(){
+    public Integer getStatus() {
         return status;
     }
 
-
-    /**
-     * 设置品台来源ID
-     *
-     * @param platformId 品台来源ID
-     */
-    public void setPlatformId(Integer platformId){
-        this.platformId = platformId;
+    public void setStatus(Integer status) {
+        this.status = status;
     }
 
-    /**
-     * 获取品台来源ID
-     *
-     * @return 品台来源ID
-     */
-    public Integer getPlatformId(){
+    public Integer getPlatformId() {
         return platformId;
     }
 
-
-    /**
-     * 设置创建者编号
-     *
-     * @param createdId 创建者编号
-     */
-    public void setCreatedId(Integer createdId){
-        this.createdId = createdId;
+    public void setPlatformId(Integer platformId) {
+        this.platformId = platformId;
     }
 
-    /**
-     * 获取创建者编号
-     *
-     * @return 创建者编号
-     */
-    public Integer getCreatedId(){
+    public Integer getCreatedId() {
         return createdId;
     }
 
-
-    /**
-     * 设置创建者编号
-     *
-     * @param modifiedId 创建者编号
-     */
-    public void setModifiedId(Integer modifiedId){
-        this.modifiedId = modifiedId;
+    public void setCreatedId(Integer createdId) {
+        this.createdId = createdId;
     }
 
-    /**
-     * 获取创建者编号
-     *
-     * @return 创建者编号
-     */
-    public Integer getModifiedId(){
+    public Integer getModifiedId() {
         return modifiedId;
     }
 
-
-    /**
-     * 设置创建时间
-     *
-     * @param createdTime 创建时间
-     */
-    public void setCreatedTime(Date createdTime){
-        this.createdTime = createdTime;
+    public void setModifiedId(Integer modifiedId) {
+        this.modifiedId = modifiedId;
     }
 
-    /**
-     * 获取创建时间
-     *
-     * @return 创建时间
-     */
-    public Date getCreatedTime(){
+    public Date getCreatedTime() {
         return createdTime;
     }
 
-
-    /**
-     * 设置更新时间
-     *
-     * @param modifiedTime 更新时间
-     */
-    public void setModifiedTime(Date modifiedTime){
-        this.modifiedTime = modifiedTime;
+    public void setCreatedTime(Date createdTime) {
+        this.createdTime = createdTime;
     }
 
-    /**
-     * 获取更新时间
-     *
-     * @return 更新时间
-     */
-    public Date getModifiedTime(){
+    public Date getModifiedTime() {
         return modifiedTime;
     }
 
+    public void setModifiedTime(Date modifiedTime) {
+        this.modifiedTime = modifiedTime;
+    }
 
-    /**
-     * 设置删除标识位
-     *
-     * @see com.ydd.framework.core.entity.enums.DeletedEnum
-     * @param deleted 删除标识位
-     */
-    public void setDeleted(Integer deleted){
+    public Integer getDeleted() {
+        return 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 getNickname() {
+        return nickname;
+    }
+
+    public void setNickname(String nickname) {
+        this.nickname = nickname;
+    }
+
+    public String getMobile() {
+        return mobile;
+    }
+
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
     }
 
     public String getLessonName() {

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

@@ -38,6 +38,11 @@ public class BarcodeOrderTime {
      */
     private Integer payMoney;
 
+    /**
+     * 总退款金额
+     */
+    private Integer sumPayMoney;
+
     private String orderSn;
 
     /**
@@ -45,7 +50,8 @@ public class BarcodeOrderTime {
      */
     private 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) {
+    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, Integer sumPayMoney, String orderSn, String orderAddSn) {
         this.id = id;
         this.memberId = memberId;
         this.venueId = venueId;
@@ -58,6 +64,7 @@ public class BarcodeOrderTime {
         this.status = status;
         this.paying = paying;
         this.payMoney = payMoney;
+        this.sumPayMoney = sumPayMoney;
         this.orderSn = orderSn;
         this.orderAddSn = orderAddSn;
     }
@@ -177,4 +184,12 @@ public class BarcodeOrderTime {
     public void setLastOut(Date lastOut) {
         this.lastOut = lastOut;
     }
+
+    public Integer getSumPayMoney() {
+        return sumPayMoney;
+    }
+
+    public void setSumPayMoney(Integer sumPayMoney) {
+        this.sumPayMoney = sumPayMoney;
+    }
 }