机构类型

src/main/java/com/github/microservice/models/device/DeviceInfoSyncParam.java

@@ -1,6 +1,7 @@
 package com.github.microservice.models.device;
 
 import cn.hutool.json.JSONObject;
+import com.github.microservice.models.type.DeviceType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -50,4 +51,6 @@ public class DeviceInfoSyncParam {
     @Schema(description = "网关ID")
     private String gateWayId;
 
+    @Schema(description = "设备类型：消费机 闸机")
+    private DeviceType deviceType;
 }

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

@@ -0,0 +1,28 @@
+package com.github.microservice.models.hxz;
+
+import com.github.microservice.models.hxz.base.HxzBaseResult;
+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/28
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class QRCodeTransactionFullResult implements Serializable {
+
+    @Schema(description = "返回参数")
+    QRCodeTransactionResult model;
+
+    @Schema(description = "支付方式")
+    PaymentType paymentType = PaymentType.WxQrCode;
+}

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

@@ -1,6 +1,8 @@
 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;
 import lombok.NoArgsConstructor;
@@ -24,6 +26,9 @@ public class QRCodeTransactionModel extends HxzSuperModel implements Serializabl
     @JsonProperty("扫描到的二维码字符串（最大长度为200）")
     private String QR;
 
+    @Schema(description = "支付方式")
+    PaymentType paymentType = PaymentType.WxQrCode;
+
     @JsonProperty("Menus")
     private Menus[] Menus;
 

src/main/java/com/github/microservice/models/hxz/QRCodeTransactionResult.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,13 +13,7 @@ import lombok.NoArgsConstructor;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class QRCodeTransactionResult {
-    @Schema(description = "1:成功；0：失败（非支付成功，而是请求服务器成功）")
-    private Integer Status = 0;
-
-    @Schema(description = "错误消息（Status为1时屏幕显示此内容，最多不超过8个汉字）")
-    private String Msg;
-
+public class QRCodeTransactionResult extends HxzBaseResult {
     @Schema(description = "订单号")
     private String Qrorder;
 }

src/main/java/com/github/microservice/models/type/PaymentType.java

@@ -7,7 +7,7 @@ import lombok.Getter;
  */
 public enum PaymentType {
     UserWallet("个人钱包"),
-    Wx("微信"),
+    WxQrCode("微信支付"),
     Uni("银联"),
     ;