Merge remote-tracking branch 'origin/test' into test

eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbCashierCart.java

@@ -155,6 +155,10 @@ public class TbCashierCart implements Serializable {
     private String uuid;
     @Column(name = "`sku_name`")
     private String skuName;
+    @Column(name = "`place_num`")
+    private Integer placeNum;
+    @Column(name = "`note`")
+    private String note;
 
     public void copy(TbCashierCart source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));

eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbOrderDetail.java

@@ -15,6 +15,7 @@
 */
 package cn.ysk.cashier.pojo.order;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import cn.hutool.core.bean.BeanUtil;
 import io.swagger.annotations.ApiModelProperty;
@@ -101,12 +102,23 @@ public class TbOrderDetail implements Serializable {
 
     @Transient
     @ApiModelProperty(value = "退单数量")
+    @TableField(exist = false)
     private Integer refundNumber;
 
     @Column(name = "`is_vip`")
     @ApiModelProperty(value = "isVip")
     private Integer isVip;
 
+    @Column(name = "`place_num`")
+    @ApiModelProperty(value = "place_num")
+    private Integer placeNum;
+
+    @Column(name = "`note`")
+    private String note;
+
+    @Column(name = "`cart_id`")
+    private Integer cartId;
+
     public void copy(TbOrderDetail source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
     }

eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbOrderInfo.java

@@ -228,6 +228,9 @@ public class TbOrderInfo implements Serializable {
     private String isUseCoupon;
     @Column(name = "`use_type`")
     private String useType;
+    @Column(name = "`place_num`")
+    @ApiModelProperty(value = "place_num")
+    private Integer placeNum;
     public void copy(TbOrderInfo source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
     }

eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopInfo.java

@@ -57,8 +57,7 @@ public class TbShopInfo implements Serializable {
     @ApiModelProperty(value = "商户Id")
     private String merchantId;
 
-    @Column(name = "`shop_name`",nullable = false)
-    @NotBlank
+    @Column(name = "`shop_name`")
     @ApiModelProperty(value = "店铺名称")
     private String shopName;
 
@@ -190,8 +189,7 @@ public class TbShopInfo implements Serializable {
     @ApiModelProperty(value = "到期时间")
     private Long expireAt;
 
-    @Column(name = "`status`",nullable = false)
-    @NotNull
+    @Column(name = "`status`")
     @ApiModelProperty(value = "门店状态")
     private Integer status;
 
@@ -258,15 +256,30 @@ public class TbShopInfo implements Serializable {
     @ApiModelProperty(value = "是否允许用户自定义金额")
     private String isMemberIn;
 
-
     @Column(name = "is_member_return")
     @ApiModelProperty(value = "是否允许用户自定义金额")
     private String isMemberReturn;
 
+    @Column(name = "is_table_fee")
+    @ApiModelProperty(value = "是否免除桌位费 0否1是")
+    private Integer isTableFee;
 
+    @Column(name = "table_fee")
+    @ApiModelProperty(value = "桌位费")
+    private BigDecimal tableFee;
 
+    @Column(name = "eat_model")
+    @ApiModelProperty(value = "就餐模式 堂食 dine-in 外带 take-out")
+    private String eatModel;
+
+    @Column(name = "small_qrcode")
+    @ApiModelProperty(value = "程序码(零点八零首页)")
+    private String smallQrcode;
+    @Column(name = "payment_qrcode")
+    @ApiModelProperty(value = "店铺收款码")
+    private String paymentQrcode;
 
     public void copy(TbShopInfo source){
-        BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(false));
+        BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
     }
 }

eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopTable.java

@@ -15,6 +15,7 @@
 */
 package cn.ysk.cashier.pojo.shop;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import cn.hutool.core.bean.BeanUtil;
 import io.swagger.annotations.ApiModelProperty;
@@ -23,6 +24,8 @@ import javax.persistence.*;
 import javax.validation.constraints.*;
 import java.math.BigDecimal;
 import java.io.Serializable;
+import java.sql.Date;
+import java.sql.Timestamp;
 
 /**
 * @website https://eladmin.vip
@@ -104,6 +107,24 @@ public class TbShopTable implements Serializable {
     @ApiModelProperty(value = "二维码")
     private String qrcode = "";
 
+    @Column(name = "`auto_clear`")
+    @ApiModelProperty(value = "自动清台")
+    private Integer autoClear=1;
+
+    @Column(name = "`use_time`")
+    private Date useTime;
+    @Column(name = "`end_time`")
+    private Date endTime;
+
+    @Column(name = "`product_num`")
+    private Integer productNum;
+    @Column(name = "`total_amount`")
+    private Integer totalAmount;
+    @Column(name = "`real_amount`")
+    private Integer realAmount;
+    @Column(name = "`use_num`")
+    private Integer useNum;
+
     public void copy(TbShopTable source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
     }