TRX 1 éve
szülő
commit
82d37cbea3

+ 26 - 0
src/main/java/com/github/microservice/models/hxz/ConsumTransactionsFullParam.java

@@ -0,0 +1,26 @@
+package com.github.microservice.models.hxz;
+
+import com.github.microservice.models.type.PaymentType;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author TRX
+ * @date 2024/6/29
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ConsumTransactionsFullParam implements Serializable {
+
+    @Schema(description = "请求参数")
+    ConsumTransactionsModel param;
+
+    @Schema(description = "支付方式")
+    PaymentType paymentType = PaymentType.UserWallet;
+
+}

+ 26 - 0
src/main/java/com/github/microservice/models/hxz/ConsumTransactionsFullResult.java

@@ -0,0 +1,26 @@
+package com.github.microservice.models.hxz;
+
+import com.github.microservice.models.type.PaymentType;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author TRX
+ * @date 2024/6/29
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ConsumTransactionsFullResult implements Serializable {
+
+    @Schema(description = "返回参数")
+    ConsumTransactionsResult model;
+
+    @Schema(description = "支付方式")
+    PaymentType paymentType = PaymentType.UserWallet;
+
+}

+ 10 - 0
src/main/java/com/github/microservice/models/hxz/ConsumTransactionsModel.java

@@ -1,6 +1,7 @@
 package com.github.microservice.models.hxz;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -13,23 +14,30 @@ import java.io.Serializable;
 public class ConsumTransactionsModel extends HxzSuperModel implements Serializable {
 
     @JsonProperty("Order")
+    @Schema(description = "消费序号(年月日时分秒+2个字节序号(0~65535)),用于识别上传数据不重复")
     private String Order;
 
+    @Schema(description = "10进制卡序列号(实体卡号或虚拟卡号)")
     @JsonProperty("CardNo")
     private String CardNo;
 
+    @Schema(description = "卡模式(0:实体卡 1:电子卡)")
     @JsonProperty("CardMode")
     private Integer CardMode;
 
+    @Schema(description = "交易模式(0:刷卡扣费 1:现金充值2:余额查询 3:钱包转账 4:现金退款)")
     @JsonProperty("Mode")
     private Integer Mode;
 
+    @Schema(description = "扣费类型(0:手动 1:菜单 2:定值 3:取餐 4:计时 5:计次)")
     @JsonProperty("PayType")
     private Integer PayType;
 
+    @Schema(description = "消费金额(Mode为2时,此字段传入值可能为0)")
     @JsonProperty("Amount")
     private String Amount;
 
+    @Schema(description = "消费菜品列表")
     @JsonProperty("Menus")
     private Menus[] Menus;
 
@@ -37,9 +45,11 @@ public class ConsumTransactionsModel extends HxzSuperModel implements Serializab
     @AllArgsConstructor
     @NoArgsConstructor
     public static class Menus {
+        @Schema(description = "菜品编号(与菜品查询接口菜品编号一致)")
         @JsonProperty("MenuID")
         private String MenuID;
 
+        @Schema(description = "菜品数量(支持小数)")
         @JsonProperty("Count")
         private String Count;
     }

+ 2 - 7
src/main/java/com/github/microservice/models/hxz/ConsumTransactionsResult.java

@@ -1,6 +1,7 @@
 package com.github.microservice.models.hxz;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.microservice.models.hxz.base.HxzBaseResult;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -12,13 +13,7 @@ import lombok.experimental.Accessors;
 @NoArgsConstructor
 @AllArgsConstructor
 @Accessors(chain = true)
-public class ConsumTransactionsResult {
-
-    @JsonProperty("Status 1:成功; 0:失败")
-    private Integer Status = 0;
-
-    @JsonProperty("Msg")
-    private String Msg = "";
+public class ConsumTransactionsResult extends HxzBaseResult {
 
     @JsonProperty("Name")
     private String Name = "测试";

+ 24 - 0
src/main/java/com/github/microservice/models/hxz/ServerTimeModel.java

@@ -0,0 +1,24 @@
+package com.github.microservice.models.hxz;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ *
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ServerTimeModel {
+
+    @Schema(description = "设备中的总白名单数")
+    @JsonProperty("WLSum")
+    private Integer wLSum;
+
+    @Schema(description = "自定义机号")
+    @JsonProperty("DeviceID")
+    private Integer deviceID;
+}

+ 23 - 0
src/main/java/com/github/microservice/models/hxz/ServerTimeResult.java

@@ -0,0 +1,23 @@
+package com.github.microservice.models.hxz;
+
+import com.github.microservice.models.hxz.base.HxzBaseResult;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author TRX
+ * @date 2024/6/25
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ServerTimeResult extends HxzBaseResult {
+    @Schema(description = "服务器时间")
+    private String Time;
+    @Schema(description = "1:有白名单更新  0:无")
+    private int WLUptate;
+    @Schema(description = "起始页数(当WLUptate为1却WLPage为0时 清除所有白名单)")
+    private int WLPage;
+}

+ 43 - 0
src/main/java/com/github/microservice/models/hxz/base/HxzBaseResult.java

@@ -0,0 +1,43 @@
+package com.github.microservice.models.hxz.base;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author TRX
+ * @date 2024/6/25
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class HxzBaseResult implements Serializable {
+
+    // 1:成功; 0:失败
+    private int Status = 0;
+
+    // 错误消息(Status为0时屏幕显示此内容,最多不超过8个汉字)
+    private String Msg;
+
+    public boolean isSuccess() {
+        return Status == 1;
+    }
+
+    // 设置失败
+    public void setFailed(String msg) {
+        Status = 0;
+        this.Msg = msg;
+    }
+    // 设置成功
+    public void setSuccess(String msg) {
+        Status = 1;
+        this.Msg = msg;
+    }
+    // 设置成功
+    public void setSuccess() {
+        Status = 1;
+    }
+
+}