机构类型

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

@@ -10,7 +10,7 @@ import java.io.Serializable;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class ConsumTransactionsModel implements Serializable {
+public class ConsumTransactionsModel extends HxzSuperModel implements Serializable {
 
     @JsonProperty("Order")
     private String Order;

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

@@ -1,5 +1,6 @@
 package com.github.microservice.models.hxz;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -12,4 +13,11 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @NoArgsConstructor
 public class HxzSuperModel {
+
+    @Schema(description = "设备ID")
+    private String DeviceId;
+
+    @Schema(description = "网关ID")
+    private String DateWayId;
+
 }

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

@@ -14,7 +14,7 @@ import java.io.Serializable;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class OrderQueryModel implements Serializable {
+public class OrderQueryModel extends HxzSuperModel implements Serializable {
 
     @Schema(description = "消费序号(年月日时分秒+2个字节序号(0~65535))，用于识别上传数据不重复")
     private String Order;

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

@@ -2,16 +2,20 @@ package com.github.microservice.models.hxz;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
 
 /**
  * @author TRX
  * @date 2024/6/28
  */
 @Data
-@AllArgsConstructor
+@Builder
 @NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
 public class OrderQueryResult {
 
     @Schema(description = "1:成功； 0：失败")

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

@@ -10,7 +10,7 @@ import java.io.Serializable;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class QRCodeTransactionModel implements Serializable {
+public class QRCodeTransactionModel extends HxzSuperModel implements Serializable {
 
     @JsonProperty("Mode:交易模式（0:扣费 1：充值3:信息查询）")
     private String Mode;

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

@@ -12,7 +12,7 @@ import lombok.NoArgsConstructor;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class TransactionInquiryModel {
+public class TransactionInquiryModel extends HxzSuperModel {
     @Schema(description = "二维码交易订单号（该值来自于第六及第七接口返回的QROrder）")
     private String QROrder;
 }