update

.gitignore

-log
+log
\ No newline at end of file
+*.log
\ No newline at end of file

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

@@ -1449,9 +1449,14 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
                         .servePicturePath(scheduleServeVar.getServePicturePath())
                         //预约服务数量
                         .serveNumber(1)
+                        //预约服务价格
                         .servePrice(scheduleServeVar.getServePrice())
+                        //预约服务类型
                         .serveType(scheduleServeVar.getServeType())
+                        //预约服务类型id
                         .serveTypeId(baseServe.getTypeId())
+                        //主服务id
+                        .mainServeId(scheduleServeVar.getMainServeId())
                         //款式参数
                         .produceBargainPrice(scheduleServeVar.getProduceBargainPrice())
                         //款式id

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

@@ -15,7 +15,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -30,7 +29,6 @@ import java.util.Set;
 @Data
 @Builder
 @AllArgsConstructor
-@NoArgsConstructor
 @TableName("order_manage")
 public class OrderManage implements Serializable {
 
@@ -284,4 +282,8 @@ public class OrderManage implements Serializable {
     public void setIsFriendPayByPayUserAndOrderUser() {
         this.isFriendPay = payUser.equals(orderUser) ? 2 : 1;
     }
+
+    public OrderManage() {
+
+    }
 }

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

@@ -46,6 +46,7 @@ public class OrderServe implements Serializable {
     private BigDecimal achievement;
     @ApiModelProperty("服务评价状态 1-未评价 2-已评价")
     private Integer commentStatus;
+
     /**
      * 价格信息
      */
@@ -77,6 +78,7 @@ public class OrderServe implements Serializable {
 
     private Integer serveTypeId;
 
+    private Integer mainServeId;
     /**
      * 预约款式vo
      */

src/main/java/com/gogirl/shared/order/OrderServeDTO.java

@@ -58,6 +58,9 @@ public class OrderServeDTO {
     @ApiModelProperty("服务单价")
     private BigDecimal servePrice;
 
+    @ApiModelProperty("服务单价")
+    private Integer mainServeId;
+
     @ApiModelProperty("闲时折扣减免的金额")
     private BigDecimal leisureDiscountPrice;