update

src/main/java/com/gogirl/application/order/serve/impl/OrderManageServiceImpl.java

@@ -294,6 +294,20 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
                 else {
                     //服务时长=服务时长
                     orderServe.setServeDuration(baseServe.getServiceDuration());
+
+                    orderServe.setProduceBargainPrice(null);
+                    //款式现价
+                    orderServe.setProduceCurrentPrice(null);
+                    //款式Id
+                    orderServe.setProduceId(null);
+                    //款式名称
+                    orderServe.setProduceName(null);
+                    //款式图片
+                    orderServe.setProducePicturePath(null);
+
+                    orderServe.setProducePromotionTimeId(null);
+
+                    orderServe.setPromotionPrice(null);
                 }
 
                 if (orderServeParam.getServeChangePrice() != null) {

src/main/java/com/gogirl/application/order/serve/impl/ScheduleManageServiceImpl.java

@@ -336,16 +336,6 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
                 })
                 .collect(Collectors.toList());
 
-//
-//        for (IdleTimeDTO idleTimeDTO : idleTimeDTOList) {
-//            List<ScheduleServeQuery> scheduleServeQueryList = idleTimeDTO.getDefaultNodeList().stream().map(TreeProgram::getScheduleServeQuery).collect(Collectors.toList());
-//            for (ScheduleServeQuery scheduleServeQuery : scheduleServeQueryList) {
-//                if (this.isLeisureTime(idleTimeDTO.getTime(), idleTimeDTO.getDateTime(), scheduleServeQuery.getServeId())) {
-//                    //闲时打折
-//                    idleTimeDTO.setIsLeisureDiscount(1);
-//                }
-//            }
-//        }
         return idleTimeDTOList;
     }
 

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

 package com.gogirl.domain.order.serve;
 
-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 com.gogirl.domain.product.serve.BaseProduce;
 import com.gogirl.domain.product.serve.BaseServe;
@@ -78,17 +75,27 @@ public class OrderServe implements Serializable {
     private String serveType;
 
     private Integer serveTypeId;
+
     /**
      * 预约款式vo
      */
+    @TableField(strategy = FieldStrategy.IGNORED)
     @ApiModelProperty("预约款式id")
     private Integer produceId;
+
+    @TableField(strategy = FieldStrategy.IGNORED)
     @ApiModelProperty("款式名称")
     private String produceName;
+
+    @TableField(strategy = FieldStrategy.IGNORED)
     @ApiModelProperty("款式图片地址")
     private String producePicturePath;
+
+    @TableField(strategy = FieldStrategy.IGNORED)
     @ApiModelProperty("款式当前价格")
     private BigDecimal produceCurrentPrice;
+
+    @TableField(strategy = FieldStrategy.IGNORED)
     @ApiModelProperty("款式特价")
     private BigDecimal produceBargainPrice;
     /**
@@ -186,13 +193,16 @@ public class OrderServe implements Serializable {
     private Integer actualServeDuration;
 
     @ApiModelProperty("服务配置时长")
+    @TableField(strategy = FieldStrategy.IGNORED)
     private Integer serveDuration;
 
     @ApiModelProperty("是否已经被卡券或者次卡折扣过 1-已经绑定了次卡或者优惠券 2-未绑定")
     private Integer bindCoupon = 2;
 
+    @TableField(strategy = FieldStrategy.IGNORED)
     private BigDecimal promotionPrice;
 
+    @TableField(strategy = FieldStrategy.IGNORED)
     private Integer producePromotionTimeId;
 
     private BigDecimal discountRate;