diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/dto/order/TbCashierCartDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/order/TbCashierCartDto.java index 61572a8b..79f159d3 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/dto/order/TbCashierCartDto.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/order/TbCashierCartDto.java @@ -105,4 +105,6 @@ public class TbCashierCartDto implements Serializable { private String isGift; private Long pendingAt; + + private String uuid; } \ No newline at end of file diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/dto/order/TbOrderInfoDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/order/TbOrderInfoDto.java index 7bc567c1..ec90d017 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/dto/order/TbOrderInfoDto.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/order/TbOrderInfoDto.java @@ -156,4 +156,6 @@ public class TbOrderInfoDto implements Serializable { private String remark; private List detailList; + + private String payRemark; } \ No newline at end of file diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbCashierCart.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbCashierCart.java index db009687..f767252b 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbCashierCart.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbCashierCart.java @@ -150,6 +150,10 @@ public class TbCashierCart implements Serializable { @ApiModelProperty(value = "pendingAt") private Long pendingAt; + @Column(name = "`uuid`") + @ApiModelProperty(value = "uuid") + private String uuid; + public void copy(TbCashierCart source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbOrderInfo.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbOrderInfo.java index 9cec3f92..77305531 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbOrderInfo.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbOrderInfo.java @@ -145,7 +145,7 @@ public class TbOrderInfo implements Serializable { private BigDecimal userCouponAmount; @Column(name = "`master_id`") - @ApiModelProperty(value = "如果为退单时,主单号") + @ApiModelProperty(value = "取餐码") private String masterId; @Column(name = "`refund_able`") @@ -208,6 +208,10 @@ public class TbOrderInfo implements Serializable { @ApiModelProperty(value = "remark") private String remark; + @Column(name = "`pay_remark`") + @ApiModelProperty(value = "payRemark") + private String payRemark; + public void copy(TbOrderInfo source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); }