更新！

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

@@ -2,6 +2,8 @@ package com.github.microservice.models.hxz;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.microservice.models.type.OrderFromType;
+import com.github.microservice.types.payment.ChargeableType;
+import com.github.microservice.types.payment.PaymentDeviceType;
 import com.github.microservice.types.payment.PaymentType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
@@ -15,6 +17,15 @@ import java.io.Serializable;
 @NoArgsConstructor
 public class ConsumTransactionsModel extends IotSuperModel implements Serializable {
 
+    @Schema(description = "订单计费方式")
+    private ChargeableType chargeableType = ChargeableType.Specified;
+
+    @Schema(description = "支付来源")
+    private OrderFromType orderFromType;
+
+    @Schema(description = "服务id、商品id")
+    private String productProvideId;
+
     @JsonProperty("Order")
     @Schema(description = "消费序号(年月日时分秒+2个字节序号(0~65535))，用于识别上传数据不重复")
     private String Order;
@@ -46,8 +57,14 @@ public class ConsumTransactionsModel extends IotSuperModel implements Serializab
     @Schema(description = "支付方式")
     private PaymentType paymentType = PaymentType.UserWallet;
 
-    @Schema(description = "支付来源：刷卡 二维码")
-    private OrderFromType orderFromType;
+    @Schema(description = "支付设备和方式")
+    private PaymentDeviceType paymentDeviceType = PaymentDeviceType.HxzConsumTransactions;
+
+    @Schema(description = "下单用户")
+    private String userId;
+
+    @Schema(description = "是否允许匿名下单")
+    private Boolean isAnonymous = Boolean.FALSE;
 
     @Data
     @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  */
 public enum OrderModeType {
 
-    Consume("扣费"),
+    Consume("消费"),
 
     BalanceInquiry("余额查询"),
 

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

@@ -11,6 +11,8 @@ public enum OrderState {
 
     PARAM_ERROR("参数验证错误"),
 
+    Order_Processing("进行中"), // 也就是说订单订单还在尽进行中，不能支付
+
     PAY_IN_PROGRESS("支付中"),
 
     HAVE_PAID("已支付"),
@@ -41,17 +43,11 @@ public enum OrderState {
 
     CLOSED("已关闭"),
 
-    SUCCESS("支付成功"),
-    REFUND("转入退款"),
-    RECHARGING("充值中"),
+    SUCCESS("支付成功"), REFUND("转入退款"), RECHARGING("充值中"),
 
-    REVOKED("：已撤销（付款码支付）"),
-    USERPAYING("用户支付中（付款码支付）"),
-    PAYERROR("支付失败(其他原因，如银行返回失败)"),
+    REVOKED("：已撤销（付款码支付）"), USERPAYING("用户支付中（付款码支付）"), PAYERROR("支付失败(其他原因，如银行返回失败)"),
 
-    TakeReview("提现审核中"),
-    Taking("提现处理中"),
-    TakeSuccess("提现成功"),
+    TakeReview("提现审核中"), Taking("提现处理中"), TakeSuccess("提现成功"),
 
     TakeRefuse("提现审批不通过"),
 

src/main/java/com/github/microservice/types/deviceUse/DeviceUseState.java

@@ -0,0 +1,20 @@
+package com.github.microservice.types.deviceUse;
+
+import lombok.Getter;
+
+/**
+ * 设置使用状态
+ */
+public enum DeviceUseState {
+    NotUsed("未使用"),
+    InUse("使用中"),
+    Finish("已完成"),
+    ;
+
+    @Getter
+    private String remark;
+
+    DeviceUseState(String remark) {
+        this.remark = remark;
+    }
+}

src/main/java/com/github/microservice/types/payment/ChargeableType.java

@@ -0,0 +1,19 @@
+package com.github.microservice.types.payment;
+
+import lombok.Getter;
+
+/**
+ * 订单计费方式
+ */
+public enum ChargeableType {
+    Specified("定额支付"), // 创建订单时就指定了 支付金额
+    FloatingPayment("浮动计费"), // 订单接收后再计费 （如，打车、洗澡等）
+    ;
+
+    @Getter
+    private String remark;
+
+    ChargeableType(String remark) {
+        this.remark = remark;
+    }
+}

src/main/java/com/github/microservice/types/payment/PayModeType.java

@@ -0,0 +1,20 @@
+package com.github.microservice.types.payment;
+
+import lombok.Getter;
+
+/**
+ * 订单支付模式
+ */
+public enum PayModeType {
+    Str("字符串"),
+    File("文件"),
+    Bool("布尔"),
+    ;
+
+    @Getter
+    private String remark;
+
+    PayModeType(String remark) {
+        this.remark = remark;
+    }
+}