协议单位和会员添加退房时间

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusMarketAgreementUnitController.java

@@ -238,6 +238,7 @@ public class BusMarketAgreementUnitController extends JeecgController<BusMarketA
 		editModel.setHomepage(busMarketAgreementUnit.getHomepage());
 		editModel.setEmail(busMarketAgreementUnit.getEmail());
 		editModel.setCustomerIndustry(busMarketAgreementUnit.getCustomerIndustry());
+		editModel.setLeaveTime(busMarketAgreementUnit.getLeaveTime());
 		busAgreementUnitService.updateById(editModel);
 		return Result.OK("编辑成功!");
 	}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusMarketAgreementUnit.java

@@ -205,4 +205,8 @@ public class BusMarketAgreementUnit implements Serializable {
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "updateTime")
     private Date updateTime;
+    /**离店时间*/
+    @Excel(name = "离店时间", width = 15)
+    @ApiModelProperty(value = "离店时间")
+    private String leaveTime;
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusMarketMember.java

@@ -175,6 +175,10 @@ public class BusMarketMember implements Serializable {
     @ApiModelProperty(value = "卡片描述")
     private String content;
 
+    /**离店时间*/
+    @Excel(name = "离店时间", width = 15)
+    @ApiModelProperty(value = "离店时间")
+	private String leaveTime;
 
     @TableField(exist = false)
     private String hotelName;

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

@@ -929,6 +929,9 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
         livingOrder.setArrivalTime(new Date());// todo 这个地方的入住开始时间应该怎么算
         if(customers.size() > 0) livingOrder.setContactId(customers.get(0).getCustomerId());
         roomsLivingOrderService.save(livingOrder);
+
+        
+
         CesRooms room = roomsService.getById(bkRoom.getRoomId());
         if(room==null) throw new JeecgBootException("房间不存在");
         room.setLivingOrderId(livingOrder.getId());