卡券修改

src/main/java/com/gogirl/domain/market/timescard/TimesCardUsedRecord.java

 package com.gogirl.domain.market.timescard;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
@@ -44,6 +41,7 @@ public class TimesCardUsedRecord {
     @ApiModelProperty("1.购卡记录;2;用卡记录")
     private Integer type;
 
+    @TableField(strategy = FieldStrategy.IGNORED)
     @ApiModelProperty("订单id")
     private Integer orderId;
 

src/main/java/com/gogirl/domain/order/serve/OrderServe.java

@@ -191,6 +191,10 @@ public class OrderServe implements Serializable {
     @ApiModelProperty("是否已经被卡券或者次卡折扣过 1-已经绑定了次卡或者优惠券 2-未绑定")
     private Integer bindCoupon = 2;
 
+    private BigDecimal promotionPrice;
+
+    private Integer producePromotionTimeId;
+
     public void addDiscountPrice(BigDecimal discountPrice) {
         this.discountPrice = this.discountPrice.add(discountPrice);
         this.payPrice = this.price.subtract(discountPrice);

src/main/java/com/gogirl/domain/order/serve/ScheduleServe.java

@@ -177,7 +177,6 @@ public class ScheduleServe implements Serializable {
     @TableField(exist = false)
     private Integer actualServeDuration;
 
-
     private BigDecimal promotionPrice;
 
     private Integer producePromotionTimeId;