diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/dto/xfj/XfjMenusDto.java b/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/dto/xfj/XfjMenusDto.java new file mode 100644 index 000000000..5989e0006 --- /dev/null +++ b/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/dto/xfj/XfjMenusDto.java @@ -0,0 +1,13 @@ +package com.bsd.pjcloud.thirdparty.dto.xfj; + +import lombok.Data; + +@Data +public class XfjMenusDto { + + /** + * 菜品编号(操作员在消费机键盘输入的数字) + */ + private String MenuNo; + +} diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/dto/xfj/XfjOffLinesDto.java b/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/dto/xfj/XfjOffLinesDto.java new file mode 100644 index 000000000..84c82b64e --- /dev/null +++ b/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/dto/xfj/XfjOffLinesDto.java @@ -0,0 +1,48 @@ +package com.bsd.pjcloud.thirdparty.dto.xfj; + +import lombok.Data; + +@Data +public class XfjOffLinesDto { + + /** + * 终端设备ID + */ + private Integer DeviceNumber; + + /** + * 消费序号(年月日时分秒+2个字节序号),用于识别上传数据不重复 + */ + private String Order; + + /** + * 扣费类型 + * 0:手动模式 + * 1:菜单模式 + * 2:定值模式 + */ + private Integer PayType; + + /** + * 卡模式 + * 0:实体卡 + * 1:电子卡 + */ + private Integer CardMode; + + /** + * 消费时间年月日时分秒 + */ + private String Time; + + /** + * 卡号10进制(实体卡号或虚拟卡号) + */ + private String CardNo; + + /** + * 扣费金额 + */ + private String Money; + +} diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/dto/xfj/XfjOrderQueryDto.java b/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/dto/xfj/XfjOrderQueryDto.java new file mode 100644 index 000000000..14c53e964 --- /dev/null +++ b/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/dto/xfj/XfjOrderQueryDto.java @@ -0,0 +1,25 @@ +package com.bsd.pjcloud.thirdparty.dto.xfj; + +import lombok.Data; + +@Data +public class XfjOrderQueryDto { + + /** + * 消费序号(年月日时分秒+2个字节序号(0~65535)),用于识别上传数据不重复 + */ + private String Order; + + /** + * 10进制卡序列号(实体卡号或虚拟卡号) + */ + private String CardNo; + + /** + * 卡模式 + * 0:实体卡 + * 1:电子卡 + */ + private Integer CardMode; + +} diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/dto/xfj/XfjQRCodeTransactionDto.java b/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/dto/xfj/XfjQRCodeTransactionDto.java new file mode 100644 index 000000000..66c6258ec --- /dev/null +++ b/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/dto/xfj/XfjQRCodeTransactionDto.java @@ -0,0 +1,55 @@ +package com.bsd.pjcloud.thirdparty.dto.xfj; + +import lombok.Data; + +import java.util.List; + +@Data +public class XfjQRCodeTransactionDto { + + /** + * 交易模式 + * 0:扣费 + * 1:充值 + * 3:信息查询 + */ + private String Mode; + + /** + * 扣费类型 + * 0:手动 + * 1:菜单 + * 2:定值 + * 3:取餐 + * 4:计时 + */ + private Integer PayType; + + /** + * 消费金额(Mode为3时,此字段传入值可能为0) + */ + private String Amount; + + /** + * 扫描到的二维码字符串(最大长度为200) + */ + private String QR; + + private List Menus; + + @Data + public static class MenuItem { + + /** + * 菜品编号(与菜品查询接口菜品编号一致) + */ + private String MenuID; + + /** + * 菜品数量(支持小数) + */ + private String Count; + + } + +} diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/dto/xfj/XfjTransactionDto.java b/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/dto/xfj/XfjTransactionDto.java new file mode 100644 index 000000000..be7d79cc8 --- /dev/null +++ b/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/dto/xfj/XfjTransactionDto.java @@ -0,0 +1,15 @@ +package com.bsd.pjcloud.thirdparty.dto.xfj; + +import lombok.Data; + +@Data +public class XfjTransactionDto { + + /** + * 从最后一笔消费往前算的位置 + * 1:就是最后一笔 + * 2:就是倒数第二笔 + */ + private Integer Number; + +} diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/dto/xfj/XfjTransactionInquiryDto.java b/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/dto/xfj/XfjTransactionInquiryDto.java new file mode 100644 index 000000000..ede97d69c --- /dev/null +++ b/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/dto/xfj/XfjTransactionInquiryDto.java @@ -0,0 +1,13 @@ +package com.bsd.pjcloud.thirdparty.dto.xfj; + +import lombok.Data; + +@Data +public class XfjTransactionInquiryDto { + + /** + * 二维码交易订单号(该值来自于第六及第七接口返回的QROrder) + */ + private String QROrder; + +} diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/dto/xfj/XfjTransactionRefundDto.java b/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/dto/xfj/XfjTransactionRefundDto.java new file mode 100644 index 000000000..ea3f6be88 --- /dev/null +++ b/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/dto/xfj/XfjTransactionRefundDto.java @@ -0,0 +1,17 @@ +package com.bsd.pjcloud.thirdparty.dto.xfj; + +import lombok.Data; + +@Data +public class XfjTransactionRefundDto { + + /** + * 消费订单号(最大30字符) + */ + private String OrderSeralid; + + /** + * 退款金额 + */ + private String Amount; +} diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/dto/xfj/XfjWhiteListDto.java b/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/dto/xfj/XfjWhiteListDto.java new file mode 100644 index 000000000..06cba524f --- /dev/null +++ b/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/dto/xfj/XfjWhiteListDto.java @@ -0,0 +1,23 @@ +package com.bsd.pjcloud.thirdparty.dto.xfj; + +import lombok.Data; + +@Data +public class XfjWhiteListDto { + + /** + * 通讯序号 + */ + private Integer CommID; + + /** + * 页数 + */ + private Integer Page; + + /** + * 页个数(一页最多有多少个名单) + */ + private Integer PageNumber; + +} diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/vo/xfj/XfjCountsVo.java b/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/vo/xfj/XfjCountsVo.java new file mode 100644 index 000000000..b83c22594 --- /dev/null +++ b/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/vo/xfj/XfjCountsVo.java @@ -0,0 +1,13 @@ +package com.bsd.pjcloud.thirdparty.vo.xfj; + +import lombok.Data; + +@Data +public class XfjCountsVo extends XfjBaseVo { + + /** + * 自定义显示文本(Status为1时传入,屏幕显示此值,内容内使用\n换行,最多支持4行,每行不超过8个汉字) + */ + private String Text; + +} diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/vo/xfj/XfjKeepAliveVo.java b/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/vo/xfj/XfjKeepAliveVo.java new file mode 100644 index 000000000..e833d50d3 --- /dev/null +++ b/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/vo/xfj/XfjKeepAliveVo.java @@ -0,0 +1,13 @@ +package com.bsd.pjcloud.thirdparty.vo.xfj; + +import lombok.Data; + +@Data +public class XfjKeepAliveVo extends XfjBaseVo { + + /** + * 二维码交易订单号,没定单号时为空 + */ + private String Qrorder; + +} diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/vo/xfj/XfjMenusVo.java b/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/vo/xfj/XfjMenusVo.java new file mode 100644 index 000000000..f37f59568 --- /dev/null +++ b/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/vo/xfj/XfjMenusVo.java @@ -0,0 +1,18 @@ +package com.bsd.pjcloud.thirdparty.vo.xfj; + +import lombok.Data; + +@Data +public class XfjMenusVo extends XfjBaseVo { + + /** + * 菜品名称 + */ + private String Name; + + /** + * 菜品单价 + */ + private String Price; + +} diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/vo/xfj/XfjOffLinesVo.java b/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/vo/xfj/XfjOffLinesVo.java new file mode 100644 index 000000000..7dbcb033c --- /dev/null +++ b/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/vo/xfj/XfjOffLinesVo.java @@ -0,0 +1,13 @@ +package com.bsd.pjcloud.thirdparty.vo.xfj; + +import lombok.Data; + +@Data +public class XfjOffLinesVo extends XfjBaseVo { + + /** + * Status为1时返回此内容(返回是请求示例中的order信息) + */ + private String Order; + +} diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/vo/xfj/XfjOrderQueryVo.java b/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/vo/xfj/XfjOrderQueryVo.java new file mode 100644 index 000000000..19fd84eec --- /dev/null +++ b/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/vo/xfj/XfjOrderQueryVo.java @@ -0,0 +1,66 @@ +package com.bsd.pjcloud.thirdparty.vo.xfj; + +import lombok.Data; + +@Data +public class XfjOrderQueryVo extends XfjBaseVo { + /** + * 人员姓名 + */ + private String Name; + + /** + * 10进制卡序列号(实体卡号或虚拟卡号) + */ + private String CardNo; + + /** + * 现金余额(允许两位小数) + */ + private String Money; + + /** + * 补贴余额(允许两位小数) + */ + private String Subsidy; + + /** + * 剩余次数 + */ + private String Times; + + /** + * 赠送余额(允许两位小数) + */ + private String Integral; + + /** + * 入场时间(固定值:"") + */ + private String InTime; + + /** + * 出场时间(固定值:"") + */ + private String OutTime; + + /** + * 累计使用时间:天时分秒 + */ + private String CumulativeTime; + + /** + * 实际扣费金额(信息查询模式下返回"0") + */ + private String Amount; + + /** + * 语音段(用于安卓系统设备) + */ + private String VoiceID; + + /** + * 自定义显示文本(Status为1时传入,屏幕显示此值,内容内使用\r\n换行,最多支持4行,每行不超过8个汉字) + */ + private String Text; +} diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/vo/xfj/XfjQRCodeTransactionVo.java b/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/vo/xfj/XfjQRCodeTransactionVo.java new file mode 100644 index 000000000..6a8d1e279 --- /dev/null +++ b/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/vo/xfj/XfjQRCodeTransactionVo.java @@ -0,0 +1,13 @@ +package com.bsd.pjcloud.thirdparty.vo.xfj; + +import lombok.Data; + +@Data +public class XfjQRCodeTransactionVo extends XfjBaseVo { + + /** + * 订单号 + */ + private String Qrorder; + +} diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/vo/xfj/XfjTransactionInquiryVo.java b/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/vo/xfj/XfjTransactionInquiryVo.java new file mode 100644 index 000000000..9ce136b06 --- /dev/null +++ b/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/vo/xfj/XfjTransactionInquiryVo.java @@ -0,0 +1,66 @@ +package com.bsd.pjcloud.thirdparty.vo.xfj; + +import lombok.Data; + +@Data +public class XfjTransactionInquiryVo extends XfjBaseVo { + /** + * 人员姓名 + */ + private String Name; + + /** + * 10进制卡序列号(实体卡号或虚拟卡号) + */ + private String CardNo; + + /** + * 现金余额(允许两位小数) + */ + private String Money; + + /** + * 补贴余额(允许两位小数) + */ + private String Subsidy; + + /** + * 剩余次数 + */ + private String Times; + + /** + * 赠送余额(允许两位小数) + */ + private String Integral; + + /** + * 入场时间(固定值:"") + */ + private String InTime; + + /** + * 出场时间(固定值:"") + */ + private String OutTime; + + /** + * 累计使用时间:天时分秒 + */ + private String CumulativeTime; + + /** + * 实际扣费金额(信息查询模式下返回"0") + */ + private String Amount; + + /** + * 语音段(用于安卓系统设备) + */ + private String VoiceID; + + /** + * 自定义显示文本(Status为1时传入,屏幕显示此值,内容内使用\r\n换行,最多支持4行,每行不超过8个汉字) + */ + private String Text; +} diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/vo/xfj/XfjTransactionRefundVo.java b/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/vo/xfj/XfjTransactionRefundVo.java new file mode 100644 index 000000000..4196d0799 --- /dev/null +++ b/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/vo/xfj/XfjTransactionRefundVo.java @@ -0,0 +1,47 @@ +package com.bsd.pjcloud.thirdparty.vo.xfj; + +import lombok.Data; + +@Data +public class XfjTransactionRefundVo extends XfjBaseVo { + + /** + * 人员姓名 + */ + private String Name; + + /** + * 10进制卡序列号(实体卡号或虚拟卡号) + */ + private String CardNo; + + /** + * 现金余额(允许两位小数) + */ + private String Money; + + /** + * 补贴余额(允许两位小数) + */ + private String Subsidy; + + /** + * 剩余次数 + */ + private String Times; + + /** + * 赠送余额(允许两位小数) + */ + private String Integral; + + /** + * 退款金额 + */ + private String Amount; + + /** + * 11 (写死 11)用于区分接口 + */ + private Integer CmdType; +} diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/vo/xfj/XfjTransactionVo.java b/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/vo/xfj/XfjTransactionVo.java new file mode 100644 index 000000000..f0d76c03f --- /dev/null +++ b/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/vo/xfj/XfjTransactionVo.java @@ -0,0 +1,52 @@ +package com.bsd.pjcloud.thirdparty.vo.xfj; + +import lombok.Data; + +@Data +public class XfjTransactionVo extends XfjBaseVo { + + /** + * 编号 从最后一笔消费往前算的位置 + * 1:就是最后一笔 + * 2:就是倒数第二笔 + */ + private String Number; + + /** + * 消费时间(格式:yyyyMMddHHmmss) + */ + private String Time; + + /** + * 卡号10进制(实体卡号或虚拟卡号) + */ + private String CardNo; + + /** + * 姓名最大5个汉字 + */ + private String Name; + + /** + * 消费额 + * - 10.00元 + */ + private String Consume; + + /** + * 余额 + * - 10.00元 + */ + private String Balance; + + /** + * 消费类型(消费 充值 退款,因错退还) + */ + private String Class; + + /** + * 消费订单号 + */ + private String OrderSeralid; + +} diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/vo/xfj/XfjWhiteListVo.java b/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/vo/xfj/XfjWhiteListVo.java new file mode 100644 index 000000000..a6dac18d7 --- /dev/null +++ b/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/vo/xfj/XfjWhiteListVo.java @@ -0,0 +1,36 @@ +package com.bsd.pjcloud.thirdparty.vo.xfj; + +import lombok.Data; + +@Data +public class XfjWhiteListVo extends XfjBaseVo { + + /** + * 返回设备提交的序号 + */ + private String CommID; + + /** + * 页数(获取那一页的数据) + */ + private String Page; + + /** + * 名单个数 + */ + private String PageLen; + + /** + * 白名单数据(1|0000000001|1,序号|卡号|操作) + * 1:添加 + * 0:删除 + */ + private String WLData; + + /** + * 1:继续获取 + * 0:已经更新完成 + */ + private String Uptate; + +}