TRX hai 1 ano
pai
achega
d999874804

+ 2 - 19
src/main/java/com/github/microservice/models/hxz/ConsumTransactionsModel.java

@@ -2,8 +2,6 @@ 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;
@@ -17,15 +15,6 @@ 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;
@@ -57,14 +46,8 @@ public class ConsumTransactionsModel extends IotSuperModel implements Serializab
     @Schema(description = "支付方式")
     private PaymentType paymentType = PaymentType.UserWallet;
 
-    @Schema(description = "支付设备和方式")
-    private PaymentDeviceType paymentDeviceType = PaymentDeviceType.HxzConsumTransactions;
-
-    @Schema(description = "下单用户")
-    private String userId;
-
-    @Schema(description = "是否允许匿名下单")
-    private Boolean isAnonymous = Boolean.FALSE;
+    @Schema(description = "支付来源:刷卡 二维码")
+    private OrderFromType orderFromType;
 
     @Data
     @AllArgsConstructor