瀏覽代碼

增加batchOrder字段

qh 2 年之前
父節點
當前提交
c7163e3608

+ 3 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusBookingBatch.java

@@ -128,6 +128,9 @@ public class BusBookingBatch implements Serializable {
     @ApiModelProperty(value = "备注")
     private String remark;
 
+    private String customerSource;
+    private Integer bookingType;
+    private String bookingDicWay;
 
 
 

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

@@ -563,6 +563,9 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
         batch.setOuterOrdersNo(data.getOuterOrdersNo());
         batch.setRemark(data.getRemark());
         batch.setHourRoomId(data.getHourRoomId());
+        batch.setCustomerSource(data.getCustomerSource());
+        batch.setBookingType(data.getBookingType());
+        batch.setBookingDicWay(data.getBookingDicWay());
         return batch;
     }
 
@@ -589,6 +592,9 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
         batch.setOuterOrdersNo(data.getOuterOrdersNo());
         batch.setRemark(data.getRemark());
         batch.setHourRoomId(data.getHourRoomId());
+        batch.setCustomerSource(data.getCustomerSource());
+        batch.setBookingType(data.getBookingType());
+        batch.setBookingDicWay(data.getBookingDicWay());
         return batch;
     }
 
@@ -608,6 +614,9 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
         batchDto.setOuterOrdersNo(order.getOuterOrdersNo());
         batchDto.setRemark(order.getRemark());
         batchDto.setHourRoomId(order.getHourRoomId());
+        batchDto.setCustomerSource(order.getCustomerSource());
+        batchDto.setBookingType(order.getBookingType());
+        batchDto.setBookingDicWay(order.getBookingDicWay());
     }
     void setBatchOrderInfoForEdit(BusRoomBookingOrders order, BookingBatchRoomsVo batchDto){
         batchDto.setBreakfastNum(order.getBreakfastNum());
@@ -625,5 +634,8 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
         batchDto.setOuterOrdersNo(order.getOuterOrdersNo());
         batchDto.setRemark(order.getRemark());
         batchDto.setHourRoomId(order.getHourRoomId());
+        batchDto.setCustomerSource(order.getCustomerSource());
+        batchDto.setBookingType(order.getBookingType());
+        batchDto.setBookingDicWay(order.getBookingDicWay());
     }
 }