更新

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 com.github.microservice.models.type.PaymentType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -41,6 +42,9 @@ public class ConsumTransactionsModel extends HxzSuperModel implements Serializab
     @JsonProperty("Menus")
     private Menus[] Menus;
 
+    @Schema(description = "支付方式")
+    PaymentType paymentType = PaymentType.UserWallet;
+
     @Data
     @AllArgsConstructor
     @NoArgsConstructor

src/main/java/com/github/microservice/models/hxz/GateWayPingInfoParam.java

@@ -1,5 +1,6 @@
 package com.github.microservice.models.hxz;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 /**
@@ -8,4 +9,5 @@ import lombok.Data;
  */
 @Data
 public class GateWayPingInfoParam extends HxzSuperModel {
+
 }

src/main/java/com/github/microservice/models/hxz/HxzSuperModel.java

@@ -1,10 +1,13 @@
 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;
 
+import java.io.Serializable;
+
 /**
  * @author TRX
  * @date 2024/6/28
@@ -12,11 +15,13 @@ import lombok.NoArgsConstructor;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class HxzSuperModel {
+public class HxzSuperModel implements Serializable {
 
+    @JsonProperty("DeviceId")
     @Schema(description = "设备ID")
     private String DeviceId;
 
+    @JsonProperty("GateWayId")
     @Schema(description = "网关ID")
     private String GateWayId;
 

src/main/java/com/github/microservice/models/hxz/OrderQueryModel.java

@@ -1,5 +1,6 @@
 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;
@@ -16,12 +17,15 @@ import java.io.Serializable;
 @NoArgsConstructor
 public class OrderQueryModel extends HxzSuperModel implements Serializable {
 
+    @JsonProperty("Order")
     @Schema(description = "消费序号(年月日时分秒+2个字节序号(0~65535))，用于识别上传数据不重复")
     private String Order;
 
+    @JsonProperty("CardNo")
     @Schema(description = "10进制卡序列号（实体卡号或虚拟卡号）")
     private String CardNo;
 
+    @JsonProperty("CardMode")
     @Schema(description = "卡模式（0：实体卡 1：电子卡）")
     private Integer CardMode;
 }

src/main/java/com/github/microservice/models/hxz/QRCodeTransactionModel.java

@@ -14,18 +14,23 @@ import java.io.Serializable;
 @NoArgsConstructor
 public class QRCodeTransactionModel extends HxzSuperModel implements Serializable {
 
-    @JsonProperty("Mode:交易模式（0:扣费 1：充值3:信息查询）")
+    @JsonProperty("Mode")
+    @Schema(description = "Mode:交易模式（0:扣费 1：充值3:信息查询）")
     private String Mode;
 
-    @JsonProperty("PayType: 扣费类型（0:手动 1：菜单 2：定值 3：取餐 4：计时）")
+    @JsonProperty("PayType")
+    @Schema(description = "PayType: 扣费类型（0:手动 1：菜单 2：定值 3：取餐 4：计时）")
     private Integer PayType;
 
-    @JsonProperty("Amount: 消费金额(Mode为3时，此字段传入值可能为0)")
+    @JsonProperty("Amount")
+    @Schema(description = "Amount: 消费金额(Mode为3时，此字段传入值可能为0)")
     private String Amount;
 
-    @JsonProperty("扫描到的二维码字符串（最大长度为200）")
+    @JsonProperty("QR")
+    @Schema(description = "扫描到的二维码字符串（最大长度为200）")
     private String QR;
 
+    @JsonProperty("paymentType")
     @Schema(description = "支付方式")
     PaymentType paymentType = PaymentType.WxQrCode;
 

src/main/java/com/github/microservice/models/hxz/TransactionInquiryModel.java

@@ -1,5 +1,6 @@
 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;
@@ -13,6 +14,8 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @NoArgsConstructor
 public class TransactionInquiryModel extends HxzSuperModel {
+
+    @JsonProperty("QROrder")
     @Schema(description = "二维码交易订单号（该值来自于第六及第七接口返回的QROrder）")
     private String QROrder;
 }