完善pos预约功能

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/pos/controller/PosOrderGoodsController.java

@@ -1,10 +1,12 @@
 package org.jeecg.modules.pos.controller;
 
 import cn.hutool.core.date.DateTime;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.Api;
@@ -17,6 +19,7 @@ import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.pos.PosBookingStateEnum;
 import org.jeecg.modules.pos.entity.*;
 import org.jeecg.modules.pos.service.*;
+import org.jeecg.modules.pos.vo.PosBooingOrderGoods;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.transaction.annotation.Transactional;
@@ -27,8 +30,9 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
- /**
+/**
  * @Description: pos_order_goods
  * @Author: jeecg-boot
  * @Date:   2023-04-13
@@ -118,8 +122,8 @@ public class PosOrderGoodsController extends JeecgController<PosOrderGoods, IPos
 	 //@RequiresPermissions("pos:pos_order_goods:add")
 	 @Transactional(rollbackFor = Exception.class)
 	 @GetMapping(value = "/getBookingOrderById")
-	 public Result<PosBookingOrder> getBookingOrderById(String bookingOrderId) {
-		 return Result.OK("修改成功", service.getBookingOrderById(bookingOrderId));
+	 public Result<PosBookingOrder> getBookingOrderById(String bookingId) {
+		 return Result.OK(service.getBookingOrderById(bookingId));
 	 }
 
 	 /**
@@ -129,13 +133,24 @@ public class PosOrderGoodsController extends JeecgController<PosOrderGoods, IPos
 	 @ApiOperation(value="pos_booking_order-分页查询", notes="pos_booking_order-分页查询")
 	 //@RequiresPermissions("pos:pos_order_goods:add")
 	 @GetMapping(value = "/getBookingPage")
-	 public Result<Page<PosBookingOrder>> getBookingPage(PosBookingOrder bookingOrder,
+	 public Result<Page<PosBooingOrderGoods>> getBookingPage(PosBookingOrder bookingOrder,
 								@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 							   @RequestParam(name="startTime" ,required=false) @JsonFormat(pattern = "yyyy-MM-dd")  @DateTimeFormat(pattern="yyyy-MM-dd") DateTime startTime,
 							   @RequestParam(name="endTime" ,required=false) @JsonFormat(pattern = "yyyy-MM-dd")  @DateTimeFormat(pattern="yyyy-MM-dd") DateTime endTime) {
-		 Page<PosBookingOrder> page = new Page<>(pageNo, pageSize);
-		 return Result.OK(bookingService.getBookingPage(bookingOrder,page,startTime,endTime));
+		 Page<PosBooingOrderGoods> page = new Page<>(pageNo, pageSize);
+//		 Page<PosBookingOrder> bookingOrderPage = bookingService.getBookingPage(bookingOrder,page,startTime,endTime);
+//		 List<String> codes = bookingOrderPage.getRecords().stream().map(PosBookingOrder::getCode).collect(Collectors.toList());
+//		 List<PosOrderGoods> orderGoodsList = service.list(Wrappers.<PosOrderGoods>lambdaQuery().in(PosOrderGoods::getBookingCode, codes));
+//		 bookingOrderPage.getRecords().forEach(e -> {
+//			 List<PosOrderGoods> posOrderGoods = orderGoodsList.stream().filter(ele -> StrUtil.equals(ele.getBookingCode(), e.getCode())).collect(Collectors.toList());
+//			 e.setPosOrderGoodList(posOrderGoods);
+//		 });
+
+
+		 Page<PosBooingOrderGoods> bookingOrderPage = service.getBookingOrderPage(bookingOrder, page, startTime, endTime);
+
+		 return Result.OK(bookingOrderPage);
 	 }
 
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/pos/controller/PosTableController.java

@@ -154,7 +154,7 @@ public class PosTableController extends JeecgController<PosTable, IPosTableServi
 			 // 是否是预约单
 			 item.setIsBooking(bookingTableIds.contains(item.getId()));
 			 // 如果桌台状态是 待下单、待结算、已经预结 就查询订单
-			 if (!item.getState().equals(0)) {
+			 if (!item.getState().equals(0) && !item.getState().equals(4)) {
 				 PosOrderGoods orderGoods = posOrderGoodsService.getOrderTeamByTableId(item.getId());
 				 item.setPosOrderGoods(orderGoods);
 			 }
@@ -183,7 +183,7 @@ public class PosTableController extends JeecgController<PosTable, IPosTableServi
 		 wrapper.eq(StrUtil.isNotEmpty(posTable.getPosRegionId()),PosTable::getPosRegionId, posTable.getPosRegionId());
 		 wrapper.eq(PosTable::getHotelId, posTable.getHotelId());
 		 wrapper.ne(PosTable::getId, posTable.getId());
-		 // 换台：0空桌。 转菜：2待结账的。 联台：1待下单、2待结账、3、已预结。
+		 // 换台可选：0空桌。 转菜可选：2待结账的。 联台可选：1待下单、2待结账、3已预结。
 		 if (posTable.getState() == 5){
 			 // 查询可联台的桌台，前端传入state = 5
 			 wrapper.and(i -> i.eq(PosTable::getState,1).or().eq(PosTable::getState,2).or().eq(PosTable::getState,3));
@@ -426,11 +426,11 @@ public class PosTableController extends JeecgController<PosTable, IPosTableServi
 	  */
 	 private List<String> getBookingTableIds() {
 		 List<PosBookingOrder> bookingOrders = bookingService.getTodayBooking();
-		 List<String> ids = bookingOrders.stream().map(PosBookingOrder::getId).collect(Collectors.toList());
-		 if (ids.isEmpty()){
+		 List<String> codes = bookingOrders.stream().map(PosBookingOrder::getCode).collect(Collectors.toList());
+		 if (codes.isEmpty()){
 			 return new ArrayList<>();
 		 }
-		 List<PosOrderGoods> orderGoods = posOrderGoodsService.listByIds(ids);
+		 List<PosOrderGoods> orderGoods = posOrderGoodsService.list(Wrappers.<PosOrderGoods>lambdaQuery().in(PosOrderGoods::getBookingCode, codes));
 		 return orderGoods.stream().map(PosOrderGoods::getPosTableId).collect(Collectors.toList());
 	 }
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/pos/entity/PosBookingOrder.java

@@ -48,7 +48,7 @@ public class PosBookingOrder implements Serializable {
     /**押金*/
     @Excel(name = "押金", width = 15)
     @ApiModelProperty(value = "押金")
-    private String deposit;
+    private BigDecimal deposit;
     /**每桌人数*/
     @Excel(name = "每桌人数", width = 15)
     @ApiModelProperty(value = "每桌人数")
@@ -61,10 +61,18 @@ public class PosBookingOrder implements Serializable {
     @Excel(name = "客人姓名", width = 15)
     @ApiModelProperty(value = "客人姓名")
     private String customerName;
+    /**客人姓名*/
+    @Excel(name = "客户来源", width = 15)
+    @ApiModelProperty(value = "客户来源")
+    private Integer customerType;
     /**电话*/
     @Excel(name = "电话", width = 15)
     @ApiModelProperty(value = "电话")
     private String phone;
+    /**pos类型*/
+    @Excel(name = "pos类型", width = 15)
+    @ApiModelProperty(value = "pos类型")
+    private String posType;
     /**备注*/
     @Excel(name = "备注", width = 15)
     @ApiModelProperty(value = "备注")

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/pos/entity/PosOrderGoods.java

@@ -58,7 +58,7 @@ public class PosOrderGoods implements Serializable {
     private Boolean isBooking;
     /**单据号*/
     @Excel(name = "预约单Code", width = 15)
-    @ApiModelProperty(value = "单据号")
+    @ApiModelProperty(value = "预约单Code")
     private String bookingCode;
     /**桌台id*/
     @Excel(name = "桌台id", width = 15)

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/pos/entity/PosOrderGoodsDetail.java

@@ -1,21 +1,19 @@
 package org.jeecg.modules.pos.entity;
 
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.math.BigDecimal;
-import java.util.List;
-
-import com.baomidou.mybatisplus.annotation.*;
-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 com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * @Description: pos_order_goods_detail

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/pos/entity/PosTable.java

@@ -69,7 +69,7 @@ public class PosTable implements Serializable {
     private java.lang.String tableNo;
 	/**状态*/
 	@Excel(name = "状态", width = 15)
-    @ApiModelProperty(value = "状态 1待下单，")
+    @ApiModelProperty(value = "状态 0空桌，1待下单，2待结账，3已预结，4待清台")
     private java.lang.Integer state;
     /**下单时间*/
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/pos/mapper/PosOrderGoodsMapper.java

@@ -2,10 +2,14 @@ package org.jeecg.modules.pos.mapper;
 
 import java.util.List;
 
+import cn.hutool.core.date.DateTime;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.jeecg.modules.pos.entity.PosBookingOrder;
 import org.jeecg.modules.pos.entity.PosOrderGoods;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.pos.vo.PosBooingOrderGoods;
 
 /**
  * @Description: pos_order_goods
@@ -15,4 +19,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface PosOrderGoodsMapper extends BaseMapper<PosOrderGoods> {
 
+    List<PosBooingOrderGoods> getBookingOrderPage(PosBookingOrder bookingOrder, Page<PosBooingOrderGoods> page, DateTime startTime, DateTime endTime);
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/pos/mapper/xml/PosOrderGoodsMapper.xml

@@ -2,4 +2,19 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.pos.mapper.PosOrderGoodsMapper">
 
+    <select id="getBookingOrderPage" resultType="org.jeecg.modules.pos.vo.PosBooingOrderGoods">
+        select pog.*, pbo.id as booking_id,pbo.people_num,pbo.sex,pbo.customer_name,
+            pbo.customer_type,pbo.phone,pbo.remark,pbo.vip_id,pbo.state,pbo.arrive_time
+        from pos_order_goods pog
+        inner join pos_booking_order pbo on pog.booking_code = pbo.code
+        where 1 = 1
+        <if test="bookingOrder.hotelId != null and bookingOrder.hotelId != ''">and pog.hotel_id = #{ bookingOrder.hotelId }</if>
+        <if test="bookingOrder.state != null">and pbo.state = #{ bookingOrder.state }</if>
+        <if test="bookingOrder.posType != null">and pbo.pos_type = #{ bookingOrder.posType }</if>
+        <if test="bookingOrder.code != null and bookingOrder.code != ''">and pbo.code = #{ bookingOrder.code }</if>
+        <if test="bookingOrder.customerName != null and bookingOrder.customerName != ''">and pbo.customerName = #{ bookingOrder.customerName }</if>
+        <if test="bookingOrder.phone != null and bookingOrder.phone != ''">and pbo.phone = #{ bookingOrder.phone }</if>
+        <if test="startTime != null">and pbo.arrive_time &gt;= #{startTime}</if>
+        <if test="endTime != null">and pbo.arrive_time &lt;= #{ endTime }</if>
+    </select>
 </mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/pos/service/IPosOrderGoodsService.java

@@ -1,8 +1,11 @@
 package org.jeecg.modules.pos.service;
 
+import cn.hutool.core.date.DateTime;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.pos.entity.PosBookingOrder;
 import org.jeecg.modules.pos.entity.PosOrderGoods;
+import org.jeecg.modules.pos.vo.PosBooingOrderGoods;
 
 import java.util.List;
 
@@ -26,7 +29,7 @@ public interface IPosOrderGoodsService extends IService<PosOrderGoods> {
 
     Boolean editBookingOrder(PosBookingOrder bookingOrder);
 
-    PosBookingOrder getBookingOrderById(String bookingOrderId);
+    PosBookingOrder getBookingOrderById(String bookingCode);
 
     List<PosBookingOrder> getBookingByTableId(String tableId);
 
@@ -42,4 +45,5 @@ public interface IPosOrderGoodsService extends IService<PosOrderGoods> {
 
     Boolean transferDishes(String posOrderId, List<String> orderGoodsDetailIds);
 
+    Page<PosBooingOrderGoods> getBookingOrderPage(PosBookingOrder bookingOrder, Page<PosBooingOrderGoods> page, DateTime startTime, DateTime endTime);
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/pos/service/impl/PosBookingOrderImpl.java

@@ -1,16 +1,21 @@
 package org.jeecg.modules.pos.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.jeecg.modules.pos.PosBookingStateEnum;
 import org.jeecg.modules.pos.entity.PosBookingOrder;
+import org.jeecg.modules.pos.entity.PosOrderGoods;
 import org.jeecg.modules.pos.mapper.PosBookingOrderMapper;
 import org.jeecg.modules.pos.service.IPosBookingService;
+import org.jeecg.modules.pos.service.IPosOrderGoodsService;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
@@ -23,6 +28,7 @@ public class PosBookingOrderImpl  extends ServiceImpl<PosBookingOrderMapper, Pos
     @Override
     public Page<PosBookingOrder> getBookingPage(PosBookingOrder bookingOrder, Page<PosBookingOrder> page, Date startTime, Date endTime) {
         LambdaQueryWrapper<PosBookingOrder> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(ObjectUtil.isNotEmpty(bookingOrder.getHotelId()),PosBookingOrder::getHotelId, bookingOrder.getHotelId());
         wrapper.eq(ObjectUtil.isNotEmpty(bookingOrder.getState()),PosBookingOrder::getState, bookingOrder.getState());
         wrapper.eq(ObjectUtil.isNotEmpty(bookingOrder.getCode()),PosBookingOrder::getCode, bookingOrder.getCode());
         wrapper.eq(ObjectUtil.isNotEmpty(bookingOrder.getCustomerName()),PosBookingOrder::getCustomerName, bookingOrder.getCustomerName());

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/pos/service/impl/PosOrderGoodsServiceImpl.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.pos.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.lang.Snowflake;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -24,6 +25,7 @@ import org.jeecg.modules.pos.TableStateEnum;
 import org.jeecg.modules.pos.entity.*;
 import org.jeecg.modules.pos.mapper.PosOrderGoodsMapper;
 import org.jeecg.modules.pos.service.*;
+import org.jeecg.modules.pos.vo.PosBooingOrderGoods;
 import org.jeecg.modules.rooms.entity.CesGoods;
 import org.jeecg.modules.rooms.service.CesGoodsServiceImpl;
 import org.springframework.stereotype.Service;
@@ -73,15 +75,15 @@ public class PosOrderGoodsServiceImpl extends ServiceImpl<PosOrderGoodsMapper, P
     /**通过桌台id查询订单*/
     @Override
     public PosOrderGoods getOrderByTableId(String tableId) {
-        LambdaQueryWrapper<PosOrderGoods> queryWrapper = new LambdaQueryWrapper<PosOrderGoods>()
-                .eq(PosOrderGoods::getStatus, 0).eq(PosOrderGoods::getPosTableId, tableId);
-        List<PosOrderGoods> orderGoods = list(queryWrapper);
-        if (orderGoods.isEmpty()){
-            throw new JeecgBootException("异常");
-        }
-        List<PosOrderGoodsDetail> goodsDetailList = posOrderGoodsDetailService.getGoodsDetail(orderGoods.get(0).getCode());
-        orderGoods.get(0).setPosOrderGoodsDetailList(goodsDetailList);
-        return orderGoods.get(0);
+        LambdaQueryWrapper<PosOrderGoods> queryWrapper = new LambdaQueryWrapper<PosOrderGoods>().eq(PosOrderGoods::getStatus, 0)
+                .eq(PosOrderGoods::getPosTableId, tableId).orderByDesc(PosOrderGoods::getCreateTime).last("limit 1");
+        PosOrderGoods orderGood = getOne(queryWrapper);
+        if (orderGood == null) {
+            throw new JeecgBootException("未找到订单");
+        }
+        List<PosOrderGoodsDetail> goodsDetailList = posOrderGoodsDetailService.getGoodsDetail(orderGood.getCode());
+        orderGood.setPosOrderGoodsDetailList(goodsDetailList);
+        return orderGood;
     }
 
     @Override
@@ -90,10 +92,9 @@ public class PosOrderGoodsServiceImpl extends ServiceImpl<PosOrderGoodsMapper, P
         lambdaQueryWrapper.eq(PosOrderGoods::getPosTableId, tableId);
         lambdaQueryWrapper.eq(PosOrderGoods::getStatus, 0);
         // 还未开台的预约单不显示
-        lambdaQueryWrapper.eq(PosOrderGoods::getIsBooking, 0);
+        lambdaQueryWrapper.eq(PosOrderGoods::getIsBooking, false);
         lambdaQueryWrapper.orderByDesc(PosOrderGoods::getCreateTime);
         lambdaQueryWrapper.last("limit 1");
-        lambdaQueryWrapper.orderByDesc(PosOrderGoods::getCreateTime);
         PosOrderGoods posOrderGood = getOne(lambdaQueryWrapper);
         if (posOrderGood == null || StrUtil.isEmpty(posOrderGood.getTeamId())){
             return posOrderGood;
@@ -279,12 +280,12 @@ public class PosOrderGoodsServiceImpl extends ServiceImpl<PosOrderGoodsMapper, P
 
     /***/
     @Override
-    public PosBookingOrder getBookingOrderById(String bookingOrderId){
-        PosBookingOrder bookingOrder = posBookingService.getById(bookingOrderId);
+    public PosBookingOrder getBookingOrderById(String bookingId){
+        PosBookingOrder bookingOrder = posBookingService.getById(bookingId);
         if (bookingOrder == null){
             throw new JeecgBootException("未找到预约单");
         }
-        List<PosOrderGoods> orderGoodsList = list(Wrappers.<PosOrderGoods>lambdaQuery().eq(PosOrderGoods::getCode, bookingOrder.getCode()));
+        List<PosOrderGoods> orderGoodsList = list(Wrappers.<PosOrderGoods>lambdaQuery().eq(PosOrderGoods::getBookingCode, bookingOrder.getCode()));
         if (orderGoodsList.isEmpty()){
             throw new JeecgBootException("未找到相关订单");
         }
@@ -324,6 +325,7 @@ public class PosOrderGoodsServiceImpl extends ServiceImpl<PosOrderGoodsMapper, P
     /**根据桌号查询今日预约单*/
     @Override
     public List<PosBookingOrder> getBookingByTableId(String tableId) {
+        // 找到预约单
         List<PosBookingOrder> bookingOrders = posBookingService.getTodayBooking();
         if (bookingOrders.isEmpty()){
             return bookingOrders;
@@ -332,12 +334,13 @@ public class PosOrderGoodsServiceImpl extends ServiceImpl<PosOrderGoodsMapper, P
         if (codes.isEmpty()){
             return new ArrayList<>();
         }
+        // 找到预约单下订单
         List<PosOrderGoods> orderGoodsList = list(Wrappers.<PosOrderGoods>lambdaQuery().in(PosOrderGoods::getBookingCode, codes));
         List<String> findCodes = orderGoodsList.stream().filter(e -> tableId.equals(e.getPosTableId())).map(PosOrderGoods::getBookingCode).collect(Collectors.toList());
         if (findCodes.isEmpty()){
             return new ArrayList<>();
         }
-        return bookingOrders.stream().filter(e -> findCodes.contains(e.getId())).collect(Collectors.toList());
+        return bookingOrders.stream().filter(e -> findCodes.contains(e.getCode())).collect(Collectors.toList());
     }
 
     /**预定开台*/
@@ -540,6 +543,11 @@ public class PosOrderGoodsServiceImpl extends ServiceImpl<PosOrderGoodsMapper, P
         return posOrderGoodsDetailService.updateBatchById(orderGoodsDetailList);
     }
 
+    @Override
+    public Page<PosBooingOrderGoods> getBookingOrderPage(PosBookingOrder bookingOrder, Page<PosBooingOrderGoods> page, DateTime startTime, DateTime endTime) {
+        return page.setRecords(baseMapper.getBookingOrderPage(bookingOrder, page, startTime, endTime));
+    }
+
 
     /**设置订单的桌号/取餐号*/
     private void setOrderTableNo(PosOrderGoods posOrderGoods) {

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/pos/vo/PosBooingOrderGoods.java

@@ -0,0 +1,46 @@
+package org.jeecg.modules.pos.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecg.modules.pos.entity.PosOrderGoods;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+public class PosBooingOrderGoods extends PosOrderGoods {
+    /**预定单id*/
+    @ApiModelProperty(value = "预定单id")
+    private String bookingId;
+    /**每桌人数*/
+    @ApiModelProperty(value = "每桌人数")
+    private Integer peopleNum;
+    /**押金*/
+    @ApiModelProperty(value = "性别")
+    private Integer sex;
+    /**客人姓名*/
+    @ApiModelProperty(value = "客人姓名")
+    private String customerName;
+    /**客户来源*/
+    @ApiModelProperty(value = "客户来源")
+    private Integer customerType;
+    /**电话*/
+    @ApiModelProperty(value = "电话")
+    private String phone;
+    /**备注*/
+    @ApiModelProperty(value = "备注")
+    private String remark;
+    /**会员id*/
+    @ApiModelProperty(value = "会员id")
+    private String vipId;
+    /**状态*/
+    @ApiModelProperty(value = "预约状态。1未到店，2已到店，3已退款，4已逾期")
+    private Integer state;
+    /**预约时间*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "预约时间")
+    private Date arriveTime;
+}