czg_team/cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

日志记录

Browse Source
This commit is contained in:
wangw
2024-04-29 09:59:48 +08:00
parent ecae487993
commit 5ac93618a6
120 changed files with 1180 additions and 738 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
eladmin-system/src/main/java/cn/ysk/cashier/pojo/TbPlatformDict.java
View File

@@ -18,23 +18,39 @@ public class TbPlatformDict implements Serializable {
@ApiModelProperty(value = "id")
private Integer id;
@Column(name = "`share_img`")
@ApiModelProperty(value = "标签前 小图标")
private String shareImg;
@Column(name = "`name`",nullable = false)
@NotBlank
@ApiModelProperty(value = "描述")
private String name;
@Column(name = "`type`",nullable = false)
@NotBlank
@ApiModelProperty(value = "轮播图；首页小菜单；")
private String type;
@Column(name = "`font_color`")
@ApiModelProperty(value = "字体色")
private String fontColor;
@Column(name = "`back_color`")
@ApiModelProperty(value = "背景色")
private String backColor;
@Column(name = "`jump_type`")
@ApiModelProperty(value = "类型: scan：拉起相机；relative：内部页面；absolute：外链url ")
private String jumpType;
@Column(name = "`abs_url`")
@ApiModelProperty(value = "绝对跳转地址")
private String absUrl;
@Column(name = "`cover_img`")
@ApiModelProperty(value = "封面图")
private String coverImg;
@Column(name = "`share_img`")
@ApiModelProperty(value = "分享图")
private String shareImg;
@Column(name = "`type`",nullable = false)
@NotBlank
@ApiModelProperty(value = "homeDistrict--金刚区（首页） carousel--轮播图 proTag--商品标签 shopTag店铺标签")
private String type;
@Column(name = "`video`")
@ApiModelProperty(value = "视频URL地址")
@@ -44,13 +60,6 @@ public class TbPlatformDict implements Serializable {
@ApiModelProperty(value = "视频封面图")
private String videoCoverImg;
@Column(name = "`rel_url`")
@ApiModelProperty(value = "相对跳转地址")
private String relUrl;
@Column(name = "`abs_url`")
@ApiModelProperty(value = "绝对跳转地址")
private String absUrl;
@Column(name = "`created_at`")
@ApiModelProperty(value = "创建时间")

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

@@ -212,6 +212,17 @@ public class TbOrderInfo implements Serializable {
@ApiModelProperty(value = "payRemark")
private String payRemark;
@Column(name = "`table_name`")
@ApiModelProperty(value = "桌码")
private String tableName;
@Column(name = "`is_buy_coupon`")
@ApiModelProperty(value = "是否购买优惠券")
private String isBuyCoupon;
@Column(name = "`is_use_coupon`")
@ApiModelProperty(value = "是否使用优惠券")
private String isUseCoupon;
public void copy(TbOrderInfo source){
BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
}

6
eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProduct.java
View File

@@ -311,6 +311,12 @@ public class TbProduct implements Serializable {
@Column(name = "spec_table_headers")
@ApiModelProperty(value = "specTableHeaders")
private String specTableHeaders;
@Column(name = "group_category_id")
@ApiModelProperty(value = "团购卷分类Id")
private String groupCategoryId;
public void copy(TbProduct source){
BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
}

2
eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductSku.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package me.zhengjie.modules.productInfo.productSku.domain;
package cn.ysk.cashier.pojo.product;
import cn.hutool.json.JSON;
import com.baomidou.mybatisplus.annotation.IdType;

46
eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbCouponCategory.java Normal file
View File

@@ -0,0 +1,46 @@
package cn.ysk.cashier.pojo.shop;
import lombok.Data;
import cn.hutool.core.bean.BeanUtil;
import io.swagger.annotations.ApiModelProperty;
import cn.hutool.core.bean.copier.CopyOptions;
import javax.persistence.*;
import java.sql.Timestamp;
import java.io.Serializable;
/**
* @website https://eladmin.vip
* @description /
* @author ww
* @date 2024-04-25
**/
@Entity
@Data
@Table(name="tb_coupon_category")
public class TbCouponCategory implements Serializable {
@Id
@Column(name = "`id`")
@ApiModelProperty(value = "id")
private Integer id;
@Column(name = "`name`")
@ApiModelProperty(value = "分类名称")
private String name;
@Column(name = "`create_time`")
@ApiModelProperty(value = "createTime")
private Timestamp createTime;
@Column(name = "`update_time`")
@ApiModelProperty(value = "updateTime")
private Timestamp updateTime;
@Column(name = "`status`")
@ApiModelProperty(value = "0：不展示；1：展示；")
private Integer status;
public void copy(TbCouponCategory source){
BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
}
}

77
eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbMerchantCoupon.java
View File

@@ -1,24 +1,25 @@
/*
* Copyright 2019-2020 Zheng Jie
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
* Copyright 2019-2020 Zheng Jie
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.ysk.cashier.pojo.shop;
import lombok.Data;
import cn.hutool.core.bean.BeanUtil;
import io.swagger.annotations.ApiModelProperty;
import cn.hutool.core.bean.copier.CopyOptions;
import javax.persistence.*;
import javax.validation.constraints.*;
import java.math.BigDecimal;
@@ -26,13 +27,13 @@ import java.io.Serializable;
import java.sql.Timestamp;
/**
* @website https://eladmin.vip
* @description /
* @author lyf
* @date 2024-03-20
**/
* @author lyf
* @website https://eladmin.vip
* @description /
* @date 2024-03-20
**/
@Entity
@Table(name="tb_merchant_coupon")
@Table(name = "tb_merchant_coupon")
public class TbMerchantCoupon implements Serializable {
@Id
@@ -49,7 +50,7 @@ public class TbMerchantCoupon implements Serializable {
@ApiModelProperty(value = " 优惠券名称")
private String title;
@Column(name = "`template_id`",nullable = false)
@Column(name = "`template_id`", nullable = false)
@NotBlank
@ApiModelProperty(value = "templateId")
private String templateId = "0";
@@ -78,7 +79,11 @@ public class TbMerchantCoupon implements Serializable {
@ApiModelProperty(value = "发放数量")
private Integer number;
@Column(name = "`left_number`",nullable = false)
@Column(name = "`use_number`")
@ApiModelProperty(value = "已核销数量")
private Integer useNumber;
@Column(name = "`left_number`", nullable = false)
@ApiModelProperty(value = "剩余数量")
private Integer leftNumber;
@@ -144,12 +149,12 @@ public class TbMerchantCoupon implements Serializable {
@ApiModelProperty(value = "说明")
private String note;
@Column(name = "`created_at`",nullable = false)
@Column(name = "`created_at`", nullable = false)
@NotNull
@ApiModelProperty(value = "createdAt")
private Long createdAt;
@Column(name = "`updated_at`",nullable = false)
@Column(name = "`updated_at`", nullable = false)
@NotNull
@ApiModelProperty(value = "updatedAt")
private Long updatedAt;
@@ -178,8 +183,12 @@ public class TbMerchantCoupon implements Serializable {
@ApiModelProperty(value = "商户Id")
private String merchantId;
public void copy(TbMerchantCoupon source){
BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
@Column(name = "`category_id`")
@ApiModelProperty(value = "分类id")
private String categoryId;
public void copy(TbMerchantCoupon source) {
BeanUtil.copyProperties(source, this, CopyOptions.create().setIgnoreNullValue(true));
}
public Integer getId() {
@@ -262,6 +271,14 @@ public class TbMerchantCoupon implements Serializable {
this.number = number;
}
public Integer getUseNumber() {
return useNumber;
}
public void setUseNumber(Integer useNumber) {
this.useNumber = useNumber;
}
public Integer getLeftNumber() {
return leftNumber;
}
@@ -453,4 +470,12 @@ public class TbMerchantCoupon implements Serializable {
public void setMerchantId(String merchantId) {
this.merchantId = merchantId;
}
public String getCategoryId() {
return categoryId;
}
public void setCategoryId(String categoryId) {
this.categoryId = categoryId;
}
}

17
eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbPlussShopStaff.java
View File

@@ -81,7 +81,22 @@ public class TbPlussShopStaff implements Serializable {
private Long updatedAt;
@Column(name = "type")
@ApiModelProperty(value = "master商户账号staff员工")
private String type;
private String type="staff";
@Column(name = "`is_manage`")
@ApiModelProperty(value = "是否允许管理端登录 0：不允许；1：允许")
private Integer isManage;
@Column(name = "`is_pc`")
@ApiModelProperty(value = "是否允许pc端登录 0：不允许；1：允许")
private Integer isPc;
@Transient
private Long roleId;
@Transient
private String phone;
public void copy(TbPlussShopStaff source){
BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
}

115
eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbPrintMachine.java Normal file
View File

@@ -0,0 +1,115 @@
/*
* Copyright 2019-2020 Zheng Jie
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.ysk.cashier.pojo.shop;
import lombok.Data;
import cn.hutool.core.bean.BeanUtil;
import io.swagger.annotations.ApiModelProperty;
import cn.hutool.core.bean.copier.CopyOptions;
import javax.persistence.*;
import javax.validation.constraints.*;
import java.io.Serializable;
/**
* @website https://eladmin.vip
* @description /
* @author lyf
* @date 2024-02-28
**/
@Entity
@Data
@Table(name="tb_print_machine")
public class TbPrintMachine implements Serializable {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "`id`")
@ApiModelProperty(value = "id")
private Integer id;
@Column(name = "`name`",nullable = false)
@NotBlank
@ApiModelProperty(value = "设备名称")
private String name;
@Column(name = "`type`")
@ApiModelProperty(value = "printer")
private String type;
@Column(name = "`connection_type`")
@ApiModelProperty(value = "现在打印机支持USB 和 网络、蓝牙")
private String connectionType;
@Column(name = "`address`")
@ApiModelProperty(value = "ip地址")
private String address;
@Column(name = "`port`")
@ApiModelProperty(value = "端口")
private String port;
@Column(name = "`sub_type`")
@ApiModelProperty(value = "打印类型（分类）")
private String subType;
@Column(name = "`status`")
@ApiModelProperty(value = "状态 online")
private Integer status;
@Column(name = "`shop_id`")
@ApiModelProperty(value = "店铺Id")
private String shopId;
@Column(name = "`category_ids`")
@ApiModelProperty(value = "分类Id")
private String categoryIds;
@Column(name = "`content_type`")
@ApiModelProperty(value = "现在打印机支持USB 和 网络两种")
private String contentType;
@Column(name = "`config`")
@ApiModelProperty(value = "主配置")
private String config;
@Column(name = "`created_at`")
@ApiModelProperty(value = "createdAt")
private Long createdAt;
@Column(name = "`updated_at`")
@ApiModelProperty(value = "updatedAt")
private Long updatedAt;
@Column(name = "`category_list`")
@ApiModelProperty(value = "分类")
private String categoryList;
@Column(name = "`sort`")
@ApiModelProperty(value = "排序")
private Integer sort;
@Column(name = "`vendor_id`")
@ApiModelProperty(value = "Android打印机需要标识设备ID ")
private String vendorId;
@Column(name = "`product_id`")
@ApiModelProperty(value = "Android打印机需要标识设备ID ")
private String productId;
public void copy(TbPrintMachine source){
BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
}
}

72
eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbPurchaseNotice.java Normal file
View File

@@ -0,0 +1,72 @@
package cn.ysk.cashier.pojo.shop;
import lombok.Data;
import cn.hutool.core.bean.BeanUtil;
import io.swagger.annotations.ApiModelProperty;
import cn.hutool.core.bean.copier.CopyOptions;
import javax.persistence.*;
import java.io.Serializable;
/**
* @author ww
* @date 2024-04-25
**/
@Entity
@Data
@Table(name="tb_purchase_notice")
public class TbPurchaseNotice implements Serializable {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "`id`")
@ApiModelProperty(value = "自增")
private Integer id;
@Column(name = "`coupon_id`")
@ApiModelProperty(value = "商户卷Id")
private Integer couponId;
@Column(name = "`date_used`")
@ApiModelProperty(value = "使用日期说明")
private String dateUsed;
@Column(name = "`available_time`")
@ApiModelProperty(value = "可用时间说明")
private String availableTime;
@Column(name = "`booking_type`")
@ApiModelProperty(value = "预约方式")
private String bookingType;
@Column(name = "`refund_policy`")
@ApiModelProperty(value = "退款说明")
private String refundPolicy;
@Column(name = "`usage_rules`")
@ApiModelProperty(value = "使用规则(富文本)")
private String usageRules;
@Column(name = "`invoice_info`")
@ApiModelProperty(value = "发票说明")
private String invoiceInfo;
@Column(name = "`group_pur_info`")
@ApiModelProperty(value = "团购价说明")
private String groupPurInfo;
@Column(name = "`market_price_Info`")
@ApiModelProperty(value = "门市价/划线价说明")
private String marketPriceInfo;
@Column(name = "`discount_Info`")
@ApiModelProperty(value = "折扣说明")
private String discountInfo;
@Column(name = "`platform_tips`")
@ApiModelProperty(value = "平台温馨提示")
private String platformTips;
public void copy(TbPurchaseNotice source){
BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
}
}

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

@@ -217,9 +217,8 @@ public class TbShopInfo implements Serializable {
@Column(name = "profiles")
@ApiModelProperty(value = "未激活 no 试用probation 正式release")
private String profiles="";
// @Column(name = "is_open_yhq")
// @ApiModelProperty(value = "是否参与优惠券活动 0否 1是")
@Transient
@Column(name = "is_open_yhq")
@ApiModelProperty(value = "是否参与优惠券活动 true false")
private String isOpenYhq;
@Column(name = "shop_qrcode")