update

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

@@ -1214,6 +1214,16 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
                     else {
                         //设置价格为服务价格
                         scheduleServe.setLengthTime(baseServe.getServiceDuration());
+                        //款式名称
+                        scheduleServe.setProduceName(null);
+                        //款式图片
+                        scheduleServe.setProducePicturePath(null);
+                        //款式原价
+                        scheduleServe.setProduceBargainPrice(null);
+                        //款式现价
+                        scheduleServe.setProduceCurrentPrice(null);
+                        //款式id
+                        scheduleServe.setProduceId(null);
                     }
                     //款式做法
                     scheduleServe.setExplain(baseServe.getExplain());

src/main/java/com/gogirl/domain/order/serve/ScheduleServe.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;
@@ -87,21 +84,26 @@ public class ScheduleServe implements Serializable {
 
 
     @ApiModelProperty("样式名称")
+    @TableField(strategy = FieldStrategy.IGNORED)
     private String produceName;
 
     @ApiModelProperty("服务数量")
     private Integer serveNumber;
 
+    @TableField(strategy = FieldStrategy.IGNORED)
     @ApiModelProperty("预约款式id")
     private Integer produceId;
 
     @ApiModelProperty("款式当前价格")
+    @TableField(strategy = FieldStrategy.IGNORED)
     private BigDecimal produceCurrentPrice;
 
     @ApiModelProperty("款式特价")
+    @TableField(strategy = FieldStrategy.IGNORED)
     private BigDecimal produceBargainPrice;
 
     @ApiModelProperty("款式图片地址")
+    @TableField(strategy = FieldStrategy.IGNORED)
     private String producePicturePath;
     /**
      * 服务

src/main/resources/mapper/order/ScheduleManageMapper.xml

@@ -249,7 +249,7 @@
         where t1.is_enabled =1
         and t2.id is not null
         and t3.id is not null
-        order by distance
+        order by distance,week_date,time_node
     </select>
 
     <select id="queryTechnicianTimeNode" resultType="com.gogirl.dto.TechnicianTimeNode">