diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/paymentchannelorder/user/request/PrePayThirdPartyDto.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/paymentchannelorder/user/request/PrePayThirdPartyDto.java index 7a7975a..857dcab 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/paymentchannelorder/user/request/PrePayThirdPartyDto.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/paymentchannelorder/user/request/PrePayThirdPartyDto.java @@ -5,10 +5,12 @@ import com.qniao.dam.domain.aggregate.paymentchannelorder.entity.PaymentChannelO import com.qniao.dam.domian.aggregate.paymentorder.constant.PaymentMethodEnum; import com.qniao.dam.infrastructure.persistent.dao.domain.PaymentOrderDao; import com.qniao.domain.Trans2DomainAssembler; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotNull; +import java.util.List; @Data public class PrePayThirdPartyDto implements Trans2DomainAssembler { @@ -23,6 +25,18 @@ public class PrePayThirdPartyDto implements Trans2DomainAssembler authFields; + + @Data + @ApiModel + public static class ThirdPartyFieldDto { + @NotNull(message = "关键字不能为空") + private String key; + + private String value; + } + @Override public PaymentChannelOrder trans2Domain() { PaymentChannelOrder paymentChannelOrder = new PaymentChannelOrder(); diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/product/user/response/UserGetProductDetailByOperatorVo.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/product/user/response/UserGetProductDetailByOperatorVo.java index c64a418..c98ad09 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/product/user/response/UserGetProductDetailByOperatorVo.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/product/user/response/UserGetProductDetailByOperatorVo.java @@ -5,6 +5,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.qniao.dam.domian.aggregate.product.constant.ProductMainCategoryEnum; import com.qniao.dam.domian.aggregate.product.constant.ProductStatusEnum; import com.qniao.dam.domian.aggregate.product.constant.ProductSubCategoryEnum; +import com.qniao.dam.domian.aggregate.product.constant.ProductTypeEnum; import com.qniao.dam.domian.aggregate.productspec.constant.ProductSpecTermUnitEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -22,6 +23,10 @@ public class UserGetProductDetailByOperatorVo { @JsonSerialize(using = ToStringSerializer.class) private Long productSpecId; + + @ApiModelProperty("产品类型(实物、虚拟物品)") + private ProductTypeEnum productType; + @ApiModelProperty("产品主分类") private ProductMainCategoryEnum mainCategory;