Prechádzať zdrojové kódy

房型id和model没有匹配的字段 fixedbug

qh 2 rokov pred
rodič
commit
b30fa55338

+ 5 - 4
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusBookingRooms.java

@@ -4,10 +4,8 @@ import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -65,4 +63,7 @@ public class BusBookingRooms implements Serializable {
     @ApiModelProperty(value = "是否主房")
     private Boolean isMain;
 
+    @TableField(exist = false)
+    private String layoutId;
+
 }

+ 2 - 2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/BusRoomBookingOrdersServiceImpl.java

@@ -409,7 +409,7 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
                     bookingRoomsItem.setIsMain(c.getIsMain());
                 }
                 bookingRoomsItem.setRoomId(c.getRoomId());
-                bookingRoomsItem.setRoomLayoutId(c.getRoomLayoutId());
+                bookingRoomsItem.setRoomLayoutId(c.getLayoutId());
                 bookingRoomsItem.setBookingType(1);
                 bookingRooms.add(bookingRoomsItem);
             });
@@ -476,7 +476,7 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
                     } else {
                         bookingRoomItem.setIsMain(s.getIsMain());
                     }
-                    bookingRoomItem.setRoomLayoutId(s.getRoomLayoutId());
+                    bookingRoomItem.setRoomLayoutId(s.getLayoutId());
                     bookingRoomItem.setBookingType(2);
                     bookingRoomItem.setBookingBatchId(batchItem.getId());
                     bookingRoomItem.setBookingOrdersId(item.getOrderInfo().getId());