TRX 1 anno fa
parent
commit
8b4559378c

+ 13 - 0
src/main/java/com/github/microservice/models/hxz/ConsumTransactionsResult.java

@@ -2,6 +2,7 @@ package com.github.microservice.models.hxz;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.microservice.models.hxz.base.HxzBaseResult;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -15,39 +16,51 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 public class ConsumTransactionsResult extends HxzBaseResult {
 
+    @Schema(description = "人员姓名")
     @JsonProperty("Name")
     private String Name = "";
 
+    @Schema(description = "10进制卡序列号(实体卡号或虚拟卡号)")
     @JsonProperty("CardNo")
     private String CardNo = "";
 
+    @Schema(description = "现金余额(允许两位小数点)")
     @JsonProperty("Money")
     private String Money = "";
 
+    @Schema(description = "补贴余额(允许两位小数点)")
     @JsonProperty("Subsidy")
     private String Subsidy = "";
 
+    @Schema(description = "剩余次数")
     @JsonProperty("Times")
     private String Times = "";
 
+    @Schema(description = "赠送余额(允许两位小数点)")
     @JsonProperty("Integral")
     private String Integral = "";
 
+    @Schema(description = "入场时间(固定值””)")
     @JsonProperty("InTime")
     private String InTime = "";
 
+    @Schema(description = "出场时间(固定值””)")
     @JsonProperty("OutTime")
     private String OutTime = "";
 
+    @Schema(description = "累计使用时间:天时分秒")
     @JsonProperty("CumulativeTime")
     private String CumulativeTime = "";
 
+    @Schema(description = "实际扣费金额(信息模式下返回为0)")
     @JsonProperty("Amount")
     private String Amount = "";
 
+    @Schema(description = "语音段")
     @JsonProperty("VoiceID")
     private String VoiceID = "";
 
+    @Schema(description = "自定义显示文本(Status为1时传入,屏幕显示此值,内容内使用\\r\\n换行,最多支持4行,每行不超过8个汉字)")
     @JsonProperty("Text")
     private String Text = "";
 

+ 4 - 36
src/main/java/com/github/microservice/models/hxz/TransactionInquiryResult.java

@@ -1,5 +1,6 @@
 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;
@@ -12,40 +13,7 @@ import lombok.NoArgsConstructor;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class TransactionInquiryResult {
-    @Schema(description = "1:成功;0:失败")
-    private Integer Status = 0;
-
-    @Schema(description = "错误消息(Status为0时屏幕显示此内容,最多不超过8个汉字)")
-    private String Msg;
-
-    @Schema(description = "人员姓名")
-    private String Name;
-    @Schema(description = "10进制卡序列号(实体卡号或虚拟卡号)")
-    private String CardNo;
-    @Schema(description = "现金余额(允许两位小数点")
-    private String Money;
-    @Schema(description = "补贴余额(允许两位小数点)")
-    private String Subsidy;
-    @Schema(description = "剩余次数")
-    private String Times;
-    @Schema(description = "赠送余额(允许两位小数点)")
-    private String Integral;
-    @Schema(description = "入场时间(固定值””)")
-    private String InTime;
-
-    @Schema(description = "出场时间(固定值””)")
-    private String OutTime;
-
-    @Schema(description = "累计使用时间:天时分秒")
-    private String CumulativeTime;
-
-    @Schema(description = "实际扣费金额(信息模式下返回为0)")
-    private String Amount;
-
-    @Schema(description = "语音段")
-    private String VoiceID;
-
-    @Schema(description = "自定义显示文本(Status为1时传入,屏幕显示此值,内容内使用\\r\\n换行,最多支持4行,每行不超过8个汉字)")
-    private String Text;
+public class TransactionInquiryResult extends HxzBaseResult {
+    @Schema(description = "订单号")
+    private String Qrorder;
 }