房态显示团队信息

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

@@ -0,0 +1,178 @@
+package org.jeecg.modules.business.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.business.entity.BusOrderFee;
+import org.jeecg.modules.business.service.IBusOrderFeeService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+
+ /**
+ * @Description: bus_order_fee
+ * @Author: jeecg-boot
+ * @Date:   2023-04-08
+ * @Version: V1.0
+ */
+@Api(tags="bus_order_fee")
+@RestController
+@RequestMapping("/business/busOrderFee")
+@Slf4j
+public class BusOrderFeeController extends JeecgController<BusOrderFee, IBusOrderFeeService> {
+	@Autowired
+	private IBusOrderFeeService busOrderFeeService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param busOrderFee
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "bus_order_fee-分页列表查询")
+	@ApiOperation(value="bus_order_fee-分页列表查询", notes="bus_order_fee-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<BusOrderFee>> queryPageList(BusOrderFee busOrderFee,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<BusOrderFee> queryWrapper = QueryGenerator.initQueryWrapper(busOrderFee, req.getParameterMap());
+		Page<BusOrderFee> page = new Page<BusOrderFee>(pageNo, pageSize);
+		IPage<BusOrderFee> pageList = busOrderFeeService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param busOrderFee
+	 * @return
+	 */
+	@AutoLog(value = "bus_order_fee-添加")
+	@ApiOperation(value="bus_order_fee-添加", notes="bus_order_fee-添加")
+	//@RequiresPermissions("business:bus_order_fee:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody BusOrderFee busOrderFee) {
+		busOrderFeeService.save(busOrderFee);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param busOrderFee
+	 * @return
+	 */
+	@AutoLog(value = "bus_order_fee-编辑")
+	@ApiOperation(value="bus_order_fee-编辑", notes="bus_order_fee-编辑")
+	//@RequiresPermissions("business:bus_order_fee:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody BusOrderFee busOrderFee) {
+		busOrderFeeService.updateById(busOrderFee);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "bus_order_fee-通过id删除")
+	@ApiOperation(value="bus_order_fee-通过id删除", notes="bus_order_fee-通过id删除")
+	//@RequiresPermissions("business:bus_order_fee:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		busOrderFeeService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "bus_order_fee-批量删除")
+	@ApiOperation(value="bus_order_fee-批量删除", notes="bus_order_fee-批量删除")
+	//@RequiresPermissions("business:bus_order_fee:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.busOrderFeeService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "bus_order_fee-通过id查询")
+	@ApiOperation(value="bus_order_fee-通过id查询", notes="bus_order_fee-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<BusOrderFee> queryById(@RequestParam(name="id",required=true) String id) {
+		BusOrderFee busOrderFee = busOrderFeeService.getById(id);
+		if(busOrderFee==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(busOrderFee);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param busOrderFee
+    */
+    //@RequiresPermissions("business:bus_order_fee:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, BusOrderFee busOrderFee) {
+        return super.exportXls(request, busOrderFee, BusOrderFee.class, "bus_order_fee");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("business:bus_order_fee:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, BusOrderFee.class);
+    }
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/dto/BookingOrderSaveDto.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.jeecg.modules.business.entity.BusBookingLayoutDayPrice;
 import org.jeecg.modules.business.entity.BusLivingLayoutDayPrice;
+import org.jeecg.modules.business.entity.BusOrderFee;
 import org.jeecg.modules.business.entity.BusRoomBookingOrders;
 
 import java.util.List;
@@ -22,6 +23,7 @@ public class BookingOrderSaveDto  {
     private List<BusLivingLayoutDayPrice> livingRoomDayPrices;
     @ApiModelProperty(value = "如果是团队预定,关联房间ID和房型每天价格 走这个参数")
     private List<BookingBatchRoomsDto> batchRooms;
+    private List<BusOrderFee> orderFees;
     // 联系人名称
     private String contactName;
     // 联系人电话

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

@@ -0,0 +1,92 @@
+package org.jeecg.modules.business.entity;
+
+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 lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: bus_order_fee
+ * @Author: jeecg-boot
+ * @Date:   2023-04-08
+ * @Version: V1.0
+ */
+@Data
+@TableName("bus_order_fee")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="bus_order_fee对象", description="bus_order_fee")
+public class BusOrderFee implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**key*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "key")
+    private String id;
+	/**入住订单id*/
+	@Excel(name = "入住订单id", width = 15)
+    @ApiModelProperty(value = "入住订单id")
+    private String livingOrderId;
+	/**房间id*/
+	@Excel(name = "房间id", width = 15)
+    @ApiModelProperty(value = "房间id")
+    private String roomId;
+	/**消费金额*/
+	@Excel(name = "消费金额", width = 15)
+    @ApiModelProperty(value = "消费金额")
+    private BigDecimal money;
+	/**账单类型1消费。2收款*/
+	@Excel(name = "账单类型1消费。2收款", width = 15)
+    @ApiModelProperty(value = "账单类型1消费。2收款")
+    private Integer feeType;
+	/**收费项目说明*/
+	@Excel(name = "收费项目说明", width = 15)
+    @ApiModelProperty(value = "收费项目说明")
+    private Integer subjectType;
+	/**付款方式*/
+	@Excel(name = "付款方式", width = 15)
+    @ApiModelProperty(value = "付款方式")
+    private Integer payType;
+	/**备注*/
+	@Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private String remark;
+	/**客单备注*/
+	@Excel(name = "客单备注", width = 15)
+    @ApiModelProperty(value = "客单备注")
+    private String custorerOrderRemark;
+	/**创建时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+	/**营业日*/
+	@Excel(name = "营业日", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "营业日")
+    private Date dayTime;
+	/**收款账单有该记录，id为消费账单id*/
+	@Excel(name = "收款账单有该记录，id为消费账单id", width = 15)
+    @ApiModelProperty(value = "收款账单有该记录，id为消费账单id")
+    private String consumeFeeId;
+	/**收款时间*/
+	@Excel(name = "收款时间", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "收款时间")
+    private Date payTime;
+}

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

@@ -5,10 +5,8 @@ import java.io.UnsupportedEncodingException;
 import java.time.LocalDateTime;
 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 com.sun.istack.NotNull;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -191,5 +189,8 @@ public class BusRoomBookingOrders implements Serializable {
     @ApiModelProperty(value = "团队类型字典ID")
     private String teamTypeDicId;
 
+    @TableField(exist = false)
+    private Boolean isTeam;
+
 
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/BusOrderFeeMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.business.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.business.entity.BusOrderFee;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: bus_order_fee
+ * @Author: jeecg-boot
+ * @Date:   2023-04-08
+ * @Version: V1.0
+ */
+public interface BusOrderFeeMapper extends BaseMapper<BusOrderFee> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusOrderFeeMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.business.mapper.BusOrderFeeMapper">
+
+</mapper>

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

@@ -0,0 +1,14 @@
+package org.jeecg.modules.business.service;
+
+import org.jeecg.modules.business.entity.BusOrderFee;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: bus_order_fee
+ * @Author: jeecg-boot
+ * @Date:   2023-04-08
+ * @Version: V1.0
+ */
+public interface IBusOrderFeeService extends IService<BusOrderFee> {
+
+}

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

@@ -0,0 +1,19 @@
+package org.jeecg.modules.business.service.impl;
+
+import org.jeecg.modules.business.entity.BusOrderFee;
+import org.jeecg.modules.business.mapper.BusOrderFeeMapper;
+import org.jeecg.modules.business.service.IBusOrderFeeService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: bus_order_fee
+ * @Author: jeecg-boot
+ * @Date:   2023-04-08
+ * @Version: V1.0
+ */
+@Service
+public class BusOrderFeeServiceImpl extends ServiceImpl<BusOrderFeeMapper, BusOrderFee> implements IBusOrderFeeService {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/controller/CesRoomsController.java

@@ -14,7 +14,10 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.vo.DictModel;
+import org.jeecg.modules.business.entity.BusRoomBookingOrders;
+import org.jeecg.modules.business.entity.BusTeam;
 import org.jeecg.modules.business.service.IBusRoomBookingOrdersService;
+import org.jeecg.modules.business.service.IBusTeamService;
 import org.jeecg.modules.rooms.DTO.*;
 import org.jeecg.modules.rooms.Enum.CouponEnums;
 import org.jeecg.modules.rooms.Enum.RoomStatusEnum;
@@ -60,6 +63,9 @@ public class CesRoomsController {
     @Resource
     private IBusRoomBookingOrdersService bookingOrdersService;
 
+    @Resource
+    private IBusTeamService teamService;
+
 
     @ApiOperation(value="房间分页列表查询", notes="房间分页列表查询")
     @GetMapping(value = "/list")
@@ -91,6 +97,13 @@ public class CesRoomsController {
                 return Result.ok(new ArrayList());
             }
             List<FloorBuildingRoomVo> otherInfos = bookingOrdersService.getRealtimeInfo(allRooms);
+            List<String> bookingOrderIds = new ArrayList<>();
+            otherInfos.forEach(c->{
+                if(c.getBookingData().getBookingOrder() != null) {
+                    bookingOrderIds.add(c.getBookingData().getBookingOrder().getId());
+                }
+            });
+            List<BusTeam> teamOrders =bookingOrderIds.size() >0? teamService.list(Wrappers.<BusTeam>query().in("booking_order_id",bookingOrderIds)):new ArrayList<>();
             floors.forEach(s-> {
                 List<CesRooms> floorRooms = allRooms.stream().filter(a->a.getFloorId().equals(s.getId())).collect(Collectors.toList());
                 List<FloorBuildingRoomVo> roomInfos = new ArrayList<>();
@@ -105,6 +118,13 @@ public class CesRoomsController {
                     roomVo.setRoomInfo(a);
                     if(opFindRoomVo.isPresent()) {
                         roomVo.setLivingData(opFindRoomVo.get().getLivingData());
+                        if(opFindRoomVo.get().getBookingData().getBookingOrder() != null) {
+                            BusRoomBookingOrders bookingOrders = opFindRoomVo.get().getBookingData().getBookingOrder();
+                            Optional<BusTeam> opTeam = teamOrders.stream().filter(r->r.getBookingOrderId().equals(bookingOrders.getId())).findFirst();
+                            if(opTeam.isPresent()) {
+                                opFindRoomVo.get().getBookingData().getBookingOrder().setIsTeam(true);
+                            }
+                        }
                         roomVo.setBookingData(opFindRoomVo.get().getBookingData());
                     }
                     roomInfos.add(roomVo);