新增功能

fuint-repository/src/main/java/com/fuint/repository/model/MtBook.java

@@ -59,6 +59,9 @@ public class MtBook implements Serializable {
     @ApiModelProperty("描述")
     private String description;
 
+    @ApiModelProperty("预约费用规则(JSON)")
+    private String priceRules;
+
     @ApiModelProperty("创建时间")
     private Date createTime;
 

fuint-repository/src/main/java/com/fuint/repository/model/MtBookItem.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -65,6 +66,18 @@ public class MtBookItem implements Serializable {
     @ApiModelProperty("预约员工ID")
     private Integer serviceStaffId;
 
+    @ApiModelProperty("签到开始时间")
+    private Date checkinStartTime;
+
+    @ApiModelProperty("签到结束时间")
+    private Date checkinEndTime;
+
+    @ApiModelProperty("签到时长(小时)")
+    private BigDecimal checkinDurationHours;
+
+    @ApiModelProperty("预约支付订单ID")
+    private Integer orderId;
+
     @ApiModelProperty("创建时间")
     private Date createTime;
 

fuint-repository/src/main/resources/mapper/MtOrderMapper.xml

@@ -24,7 +24,7 @@
     </select>
 
     <select id="findByOrderSn" resultType="com.fuint.repository.model.MtOrder">
-        select * from mt_order o where o.ORDER_SN = #{orderSn}
+        select * from mt_order o where o.ORDER_SN = #{orderSn} order by o.ID desc limit 1
     </select>
 
     <select id="getPayMoney" resultType="java.math.BigDecimal">