Merge branch 'master' of http://49.4.53.36:3000/hotel/hotel-saas-backend

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

@@ -1,7 +1,9 @@
 package org.jeecg.modules.business.controller;
 
+import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.List;
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -20,13 +22,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.business.dto.BusMarketAgreementCheckInRecordDto;
 import org.jeecg.modules.business.entity.*;
+import org.jeecg.modules.business.enums.AgreementCommonEnum;
 import org.jeecg.modules.business.enums.AgreenmentAccountStatus;
 import org.jeecg.modules.business.enums.AgreenmentCheckStatus;
-import org.jeecg.modules.business.service.IBusMarketAgreementUnitService;
-import org.jeecg.modules.business.service.IBusHotelService;
+import org.jeecg.modules.business.service.*;
 import org.jeecg.common.system.base.controller.JeecgController;
-import org.jeecg.modules.system.entity.SysDictItem;
+import org.jeecg.modules.rooms.service.CesRoomLayoutServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
@@ -50,6 +53,19 @@ public class BusMarketAgreementUnitController extends JeecgController<BusMarketA
 
 	 @Autowired
 	 private IBusHotelService busHotelService;
+
+	@Autowired
+	private IBusMarketAgreementCheckInRecordService busMarketAgreementCheckInRecordService;
+
+	@Autowired
+	private IBusMarketAgreementCustomerService busMarketAgreementCustomerService;
+
+	@Autowired
+	private IBusMarketAgreementCustomerHousePriceService busMarketAgreementCustomerHousePriceService;
+
+	@Resource
+	private CesRoomLayoutServiceImpl cesRoomLayoutService;
+
 	/**
 	 * 分页列表查询
 	 *
@@ -85,6 +101,61 @@ public class BusMarketAgreementUnitController extends JeecgController<BusMarketA
 		return Result.OK(pageList);
 	}
 
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param busMarketAgreementCheckInRecordDto
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "协议单位-入住记录-分页列表查询")
+	@ApiOperation(value="协议单位-入住记录-分页列表查询", notes="协议单位-入住记录-分页列表查询")
+	@GetMapping(value = "/listCheckInRecord")
+	public Result<IPage<BusMarketAgreementCheckInRecordDto>> queryPageCheckInRecordList(BusMarketAgreementCheckInRecordDto busMarketAgreementCheckInRecordDto,
+																						@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+																						@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+																						HttpServletRequest req) {
+		Page<BusMarketAgreementCheckInRecordDto> page = new Page<BusMarketAgreementCheckInRecordDto>(pageNo, pageSize);
+		String startDate = busMarketAgreementCheckInRecordDto.getStartDate() + " 00:00:00";
+		String endDate = busMarketAgreementCheckInRecordDto.getEndDate() + " 23:59:59";
+		IPage<BusMarketAgreementCheckInRecordDto> pageList = busMarketAgreementCheckInRecordService
+				.getCheckInRecord(page,busMarketAgreementCheckInRecordDto.getAgreementId(), startDate, endDate, busMarketAgreementCheckInRecordDto.getRoomNumber(), busMarketAgreementCheckInRecordDto.getCustomerName());
+
+		pageList.getRecords().forEach(item->{
+			//当前客户有选择具体客户协议，则房价根据客户协议处理
+			if (item.getAgreementCustomerId() != null && !item.getAgreementCustomerId().equals("")){
+				BigDecimal realPrice = getRealPrice(item);
+				item.setHousePrice(realPrice);
+				item.setTotalPrice(realPrice);
+			}
+		});
+		return Result.OK(pageList);
+	}
+
+	public BigDecimal getRealPrice(BusMarketAgreementCheckInRecordDto item){
+		long realPrice = 0;
+		BusMarketAgreementCustomer busMarketAgreementCustomer = busMarketAgreementCustomerService.getById(item.getAgreementCustomerId());
+		if (busMarketAgreementCustomer != null ){
+			//使用固定折扣，则房价=门市价*固定折扣
+			if (busMarketAgreementCustomer.getFixedDiscount() == AgreementCommonEnum.yes.getKey()){
+				realPrice = Math.round(item.getHousePrice().doubleValue() * (busMarketAgreementCustomer.getDiscount().doubleValue()/100));
+			}else{
+				//获取到协议房价表
+				QueryWrapper<BusMarketAgreementCustomerHousePrice> queryWrapper = new QueryWrapper<BusMarketAgreementCustomerHousePrice>();
+				queryWrapper.eq("customer_id",item.getAgreementCustomerId());
+				queryWrapper.eq("layout_id",item.getLayoutId());
+				BusMarketAgreementCustomerHousePrice busMarketAgreementCustomerHousePrice = busMarketAgreementCustomerHousePriceService.getOne(queryWrapper);
+				if(busMarketAgreementCustomerHousePrice != null && busMarketAgreementCustomerHousePrice.getDiscount() !=null){
+					realPrice = Math.round(item.getHousePrice().doubleValue() * (busMarketAgreementCustomerHousePrice.getDiscount().doubleValue()/100));
+				}
+			}
+		}
+		return  BigDecimal.valueOf(realPrice);
+	}
+
 	/**
 	 *   添加
 	 *

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

@@ -0,0 +1,70 @@
+package org.jeecg.modules.business.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+/*
+ * 协议入住记录
+ * */
+public class BusMarketAgreementCheckInRecordDto {
+    @Excel(name = "单号", width = 15)
+    @ApiModelProperty(value = "单号")
+    private String orderNumber;
+
+    @Excel(name = "房间号", width = 15)
+    @ApiModelProperty(value = "房间号")
+    private String roomNumber;
+
+    @Excel(name = "房价", width = 15)
+    @ApiModelProperty(value = "房价")
+    private BigDecimal housePrice;
+
+    /**入住时间*/
+    @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 arrivalTime;
+
+    /**预离时间*/
+    @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 dueOutTime;
+
+    /**入住天数*/
+    @Excel(name = "入住天数", width = 15)
+    @ApiModelProperty(value = "入住天数")
+    private Integer dayCount;
+
+    @Excel(name = "入住类型", width = 15)
+    @ApiModelProperty(value = "入住类型")
+    private Integer checkinType;
+
+    @Excel(name = "状态", width = 15)
+    @ApiModelProperty(value = "状态")
+    private Integer status;
+
+    @Excel(name = "客人姓名", width = 15)
+    @ApiModelProperty(value = "客人姓名")
+    private String customerName;
+
+    @Excel(name = "总消费", width = 15)
+    @ApiModelProperty(value = "总消费")
+    private BigDecimal totalPrice;
+
+    private String agreementId;
+    private String startDate;
+    private String endDate;
+
+    private String agreementCustomerId;
+    private String layoutId;
+}

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

@@ -0,0 +1,18 @@
+package org.jeecg.modules.business.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.business.dto.BusMarketAgreementCheckInRecordDto;
+
+import java.util.List;
+
+public interface BusMarketAgreementCheckInRecordMapper extends BaseMapper<BusMarketAgreementCheckInRecordDto> {
+
+    List<BusMarketAgreementCheckInRecordDto> getCheckInRecord(Page<BusMarketAgreementCheckInRecordDto> page, String agreementid,
+                                                              @Param("startdate") String startdate,
+                                                              @Param("enddate") String enddate,
+                                                              @Param("roomnumber") String roomnumber,
+                                                              @Param("customername") String customername);
+
+}

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

@@ -1,8 +1,11 @@
 package org.jeecg.modules.business.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import io.lettuce.core.dynamic.annotation.Param;
 import org.jeecg.modules.business.entity.BusMarketAgreementUnit;
 
+import java.util.List;
+
 /**
  * @Description: 协议单位
  * @Author: jeecg-boot

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

@@ -0,0 +1,77 @@
+<?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.BusMarketAgreementCheckInRecordMapper">
+<!--	<resultMap id="BusMarketAgreementCheckInRecord" type="org.jeecg.modules.business.dto.BusMarketAgreementCheckInRecord" >-->
+<!--		<result column="id" property="id" jdbcType="VARCHAR"/>-->
+<!--		<result column="titile" property="titile" jdbcType="VARCHAR"/>-->
+<!--		<result column="msg_content" property="msgContent" jdbcType="VARCHAR"/>-->
+<!--		<result column="start_time" property="startTime" jdbcType="TIMESTAMP"/>-->
+<!--		<result column="end_time" property="endTime" jdbcType="TIMESTAMP"/>-->
+<!--		<result column="sender" property="sender" jdbcType="VARCHAR"/>-->
+<!--		<result column="priority" property="priority" jdbcType="VARCHAR"/>-->
+<!--		<result column="msg_category" property="msgCategory" jdbcType="VARCHAR"/>-->
+<!--		<result column="msg_type" property="msgType" jdbcType="VARCHAR"/>-->
+<!--		<result column="send_status" property="sendStatus" jdbcType="VARCHAR"/>-->
+<!--		<result column="send_time" property="sendTime" jdbcType="VARCHAR"/>-->
+<!--		<result column="cancel_time" property="cancelTime" jdbcType="VARCHAR"/>-->
+<!--		<result column="del_flag" property="delFlag" jdbcType="VARCHAR"/>-->
+<!--		<result column="create_by" property="createBy" jdbcType="VARCHAR"/>-->
+<!--		<result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>-->
+<!--		<result column="update_by" property="updateBy" jdbcType="VARCHAR"/>-->
+<!--		<result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>-->
+<!--		<result column="user_ids" property="userIds" jdbcType="VARCHAR"/>-->
+<!--	</resultMap>-->
+
+
+<!--	<select id="querySysCementListByUserId" parameterType="String"  resultMap="BusMarketAgreementCheckInRecord">-->
+<!--	   select sa.* from sys_announcement sa,sys_announcement_send sas-->
+<!--	   where sa.id = sas.annt_id-->
+<!--	   and sa.send_status = '1'-->
+<!--	   and sa.del_flag = '0'-->
+<!--	   and sas.user_id = #{userId}-->
+<!--	   and sa.msg_category = #{msgCategory}-->
+<!--	   and sas.read_flag = '0'-->
+<!--	</select>-->
+
+	<!-- 获取入住记录 -->
+	<select id="getCheckInRecord" resultType="org.jeecg.modules.business.dto.BusMarketAgreementCheckInRecordDto">
+		SELECT
+			l.living_order_no AS order_number,-- 单号
+			CONCAT(r.prefix,r.`name`) AS room_number,-- 房间号
+			rl.market_price AS house_price,-- 房价
+			l.arrival_time AS arrival_time,-- 入住时间
+			l.due_out_time AS due_out_time,-- 离店时间
+			l.day_count AS day_count,-- 入住天数
+			--(CASE WHEN bo.booking_type = 1 THEN '全天房' ELSE '钟点房' END ) AS checkin_type,-- 入住类型
+			bo.booking_type AS checkin_type,-- 入住类型
+			0 AS status,-- 状态
+			lc.customer_name AS customer_name, -- 客人名称
+			0 AS total_price, -- 总消费
+			IFNULL(l.contract_team_protocol_id,'') AS agreement_customer_id, -- 客户协议编号
+			IFNULL(r.layout_id,'') AS layout_id -- 房型编号
+		FROM bus_market_agreement_unit_info a
+			LEFT JOIN bus_rooms_living_order l ON a.id = l.contract_team_id AND l.customer_type = 3
+			LEFT JOIN bus_room_booking_orders bo ON l.booking_order_id = bo.id
+			LEFT JOIN bus_market_agreement_customer_info ac ON l.contract_team_protocol_id = ac.id
+			LEFT JOIN bus_booking_rooms b ON l.booking_room_id = b.id
+			LEFT JOIN ces_rooms r ON b.room_id = r.id
+			LEFT JOIN ces_room_layout rl ON r.layout_id = rl.id
+			LEFT JOIN bus_living_customer lc ON l.id = lc.living_order_id
+		WHERE 1 = 1
+			AND a.del_flag = 0
+			AND r.invalid = 0
+			AND a.id = #{agreementid}
+			<if test="roomnumber!=null and roomnumber!=''">
+				<bind name="bindroomnumber" value="'%'+roomnumber+'%'"/>
+				AND CONCAT(r.prefix,r.`name`) LIKE #{bindroomnumber}
+			</if>
+			<if test="customername!=null and customername!=''">
+				<bind name="bindcustomername" value="'%'+customername+'%'"/>
+				AND lc.customer_name LIKE #{bindcustomername}
+			</if>
+			<if test="startdate!=null and startdate!='' and enddate!=null and enddate!=''">
+				AND l.arrival_time BETWEEN #{startdate} AND #{enddate}
+			</if>
+		ORDER BY l.create_time DESC
+	</select>
+</mapper>

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

@@ -5,4 +5,33 @@
     <select id="queryMaxAccount" resultType="String">
 		SELECT IFNULL(MAX(account_no),'A0000') FROM bus_market_agreement_unit_info
 	</select>
+
+    <!-- 获取入住记录 -->
+    <select id="getCheckInRecord" resultType="org.jeecg.modules.business.dto.BusMarketAgreementCheckInRecordDto">
+		SELECT
+			l.living_order_no AS order_number,-- 单号
+			(r.prefix+r.`name`) AS room_number,-- 房间号
+			rl.market_price AS house_price,-- 房价
+			l.arrival_time AS arrival_time,-- 入住时间
+			l.due_out_time AS due_out_time,-- 离店时间
+			l.day_count AS day_count,-- 入住天数
+			--(CASE WHEN bo.booking_type = 1 THEN '全天房' ELSE '钟点房' END ) AS checkin_type,-- 入住类型
+			bo.booking_type AS checkin_type,-- 入住类型
+			0 AS status,-- 状态
+			lc.customer_name AS customer_name, -- 客人名称
+			0 AS total_price -- 总消费
+		FROM bus_market_agreement_unit_info a
+			LEFT JOIN bus_rooms_living_order l ON a.id = l.contract_team_id AND l.customer_type = 3
+			LEFT JOIN bus_room_booking_orders bo ON l.booking_order_id = bo.id
+			LEFT JOIN bus_market_agreement_customer_info ac ON l.contract_team_protocol_id = ac.id
+			LEFT JOIN bus_booking_rooms b ON l.booking_room_id = b.id
+			LEFT JOIN ces_rooms r ON b.room_id = r.id
+			LEFT JOIN ces_room_layout rl ON r.layout_id = rl.id
+			LEFT JOIN bus_living_customer lc ON l.id = lc.living_order_id
+		WHERE 1 = 1
+			AND a.del_flag = 0
+			AND r.invalid = 0
+		ORDER BY id DESC
+		LIMIT #{offset}, #{pagesize}
+	</select>
 </mapper>

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

@@ -3,7 +3,6 @@ package org.jeecg.modules.business.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.business.entity.BusHotel;
-import org.jeecg.modules.system.entity.SysUser;
 
 /**
  * @Description: bus_hotel

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

@@ -0,0 +1,12 @@
+package org.jeecg.modules.business.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.business.dto.BusMarketAgreementCheckInRecordDto;
+import org.jeecg.common.api.vo.Result;
+
+public interface IBusMarketAgreementCheckInRecordService extends IService<BusMarketAgreementCheckInRecordDto> {
+
+    public Page<BusMarketAgreementCheckInRecordDto> getCheckInRecord(Page<BusMarketAgreementCheckInRecordDto> page,
+                                                                     String agreementid,String startdate, String enddate, String roomnumber, String customername);
+}

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

@@ -1,8 +1,11 @@
 package org.jeecg.modules.business.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.business.entity.BusMarketAgreementUnit;
 
+import java.util.List;
+
 /**
  * @Description: 协议单位
  * @Author: jeecg-boot
@@ -11,7 +14,7 @@ import org.jeecg.modules.business.entity.BusMarketAgreementUnit;
  */
 public interface IBusMarketAgreementUnitService extends IService<BusMarketAgreementUnit> {
     /**
-     * 添加数据日志
+     * 获取最大账号
      */
     public String getMaxAccount();
 

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

@@ -0,0 +1,28 @@
+package org.jeecg.modules.business.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.modules.business.dto.BusMarketAgreementCheckInRecordDto;
+import org.jeecg.modules.business.mapper.BusMarketAgreementCheckInRecordMapper;
+import org.jeecg.modules.business.service.IBusMarketAgreementCheckInRecordService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Service
+@Slf4j
+public class BusMarketAgreementCheckInRecordServiceImpl extends ServiceImpl<BusMarketAgreementCheckInRecordMapper
+        , BusMarketAgreementCheckInRecordDto> implements IBusMarketAgreementCheckInRecordService {
+    @Resource
+    private BusMarketAgreementCheckInRecordMapper busMarketAgreementCheckInRecordMapper;
+
+    @Override
+    public Page<BusMarketAgreementCheckInRecordDto> getCheckInRecord(Page<BusMarketAgreementCheckInRecordDto> page, String agreementid, String startdate, String enddate, String roomnumber, String customername) {
+        if (page.getSize() == -1) {
+            return page.setRecords(busMarketAgreementCheckInRecordMapper.getCheckInRecord(null,agreementid, startdate, enddate,roomnumber,customername));
+        } else {
+            return page.setRecords(busMarketAgreementCheckInRecordMapper.getCheckInRecord(page,agreementid, startdate, enddate,roomnumber,customername));
+        }
+    }
+}

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

@@ -8,6 +8,8 @@ import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import java.util.List;
+
 /**
  * @Description: 协议单位
  * @Author: jeecg-boot
@@ -26,4 +28,5 @@ public class BusMarketMarketAgreementUnitServiceImpl extends ServiceImpl<BusMark
         String maxAccount = busMarketAgreementUnitMapper.queryMaxAccount();
         return  maxAccount;
     }
+
 }