更新

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.OrderFromType;
 import com.github.microservice.models.type.PaymentType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
@@ -43,7 +44,10 @@ public class ConsumTransactionsModel extends HxzSuperModel implements Serializab
     private Menus[] Menus;
 
     @Schema(description = "支付方式")
-    PaymentType paymentType = PaymentType.UserWallet;
+    private PaymentType paymentType = PaymentType.UserWallet;
+
+    @Schema(description = "支付来源：刷卡 二维码")
+    private OrderFromType orderFromType;
 
     @Data
     @AllArgsConstructor

src/main/java/com/github/microservice/models/requestModel/SuperResponseModel.java

@@ -15,6 +15,8 @@ import org.apache.commons.lang3.StringUtils;
 @NoArgsConstructor
 public class SuperResponseModel {
 
+    public static final String BAD_REQUEST = "BAD_REQUEST";
+
     @Schema(description = "返回码")
     private int code;
 
@@ -25,6 +27,8 @@ public class SuperResponseModel {
 
     private String errInfo;
 
+    private String errMsg;
+
     public boolean isSuccess = false;
 
     @Schema(description = "消耗的毫秒数")
@@ -57,6 +61,9 @@ public class SuperResponseModel {
         if (StringUtils.isNotEmpty(errInfo)) {
             return errInfo;
         }
+        if (StringUtils.isNotEmpty(errMsg)) {
+            return errMsg;
+        }
         return msg;
     }
 

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

@@ -8,6 +8,7 @@ import lombok.Getter;
 public enum OrderFromType {
     Swipe("刷卡"),
     QrCode("扫码"),
+    Face("刷脸"),
     ;
 
     @Getter

src/main/java/com/github/microservice/types/OrderState.java

@@ -11,6 +11,8 @@ public enum OrderState {
 
     PARAM_ERROR("参数验证错误"),
 
+    PAY_IN_PROGRESS("支付中"),
+
     HAVE_PAID("已支付"),
 
     PAID_ERROR("支付失败"),