From 73f5a3f48dbe5cc359feecf8288788b1b55bffef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=9A=93=E9=9B=AF?= <18868469283@qq.com> Date: Fri, 11 Jan 2019 18:35:49 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8F=82=E6=95=B0=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/sock/mall/dto/OmsMoneyInfoParam.java | 18 +++++++++++++ .../sock/mall/dto/OmsOrderDeliveryParam.java | 19 ++++++++++++++ .../com/sock/mall/dto/OmsOrderDetail.java | 21 ++++++++++++++++ .../com/sock/mall/dto/OmsOrderQueryParam.java | 25 +++++++++++++++++++ .../mall/dto/OmsOrderReturnApplyResult.java | 15 +++++++++++ .../mall/dto/OmsReturnApplyQueryParam.java | 25 +++++++++++++++++++ 6 files changed, 123 insertions(+) create mode 100644 代码库/mall-admin/src/main/java/com/sock/mall/dto/OmsMoneyInfoParam.java create mode 100644 代码库/mall-admin/src/main/java/com/sock/mall/dto/OmsOrderDeliveryParam.java create mode 100644 代码库/mall-admin/src/main/java/com/sock/mall/dto/OmsOrderDetail.java create mode 100644 代码库/mall-admin/src/main/java/com/sock/mall/dto/OmsOrderQueryParam.java create mode 100644 代码库/mall-admin/src/main/java/com/sock/mall/dto/OmsOrderReturnApplyResult.java create mode 100644 代码库/mall-admin/src/main/java/com/sock/mall/dto/OmsReturnApplyQueryParam.java diff --git a/代码库/mall-admin/src/main/java/com/sock/mall/dto/OmsMoneyInfoParam.java b/代码库/mall-admin/src/main/java/com/sock/mall/dto/OmsMoneyInfoParam.java new file mode 100644 index 0000000..68145d4 --- /dev/null +++ b/代码库/mall-admin/src/main/java/com/sock/mall/dto/OmsMoneyInfoParam.java @@ -0,0 +1,18 @@ +package com.macro.mall.dto; + +import lombok.Getter; +import lombok.Setter; + +import java.math.BigDecimal; + +/** + * ޸ĶϢ + */ +@Getter//getʹlombokԶĬgetter +@Setter//setʹlombokԶĬsetter +public class OmsMoneyInfoParam { + private Long orderId;//id + private BigDecimal freightAmount;//˷ܼ + private BigDecimal discountAmount;//ۿܼ + private Integer status;//״̬ +} diff --git a/代码库/mall-admin/src/main/java/com/sock/mall/dto/OmsOrderDeliveryParam.java b/代码库/mall-admin/src/main/java/com/sock/mall/dto/OmsOrderDeliveryParam.java new file mode 100644 index 0000000..f3b2ca9 --- /dev/null +++ b/代码库/mall-admin/src/main/java/com/sock/mall/dto/OmsOrderDeliveryParam.java @@ -0,0 +1,19 @@ +package com.macro.mall.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +/** + * + */ +@Getter +@Setter +public class OmsOrderDeliveryParam { + @ApiModelProperty("id") + private Long orderId; + @ApiModelProperty("˾") + private String deliveryCompany; + @ApiModelProperty("") + private String deliverySn; +} diff --git a/代码库/mall-admin/src/main/java/com/sock/mall/dto/OmsOrderDetail.java b/代码库/mall-admin/src/main/java/com/sock/mall/dto/OmsOrderDetail.java new file mode 100644 index 0000000..2ba60e1 --- /dev/null +++ b/代码库/mall-admin/src/main/java/com/sock/mall/dto/OmsOrderDetail.java @@ -0,0 +1,21 @@ +package com.macro.mall.dto; + +import com.macro.mall.model.OmsOrder; +import com.macro.mall.model.OmsOrderItem; +import com.macro.mall.model.OmsOrderOperateHistory; +import lombok.Getter; +import lombok.Setter; + +import java.util.List; + +/** + * Ϣ + */ +public class OmsOrderDetail extends OmsOrder { + @Getter + @Setter + private List orderItemList; + @Getter + @Setter + private List historyList;//־ +} diff --git a/代码库/mall-admin/src/main/java/com/sock/mall/dto/OmsOrderQueryParam.java b/代码库/mall-admin/src/main/java/com/sock/mall/dto/OmsOrderQueryParam.java new file mode 100644 index 0000000..05e1d20 --- /dev/null +++ b/代码库/mall-admin/src/main/java/com/sock/mall/dto/OmsOrderQueryParam.java @@ -0,0 +1,25 @@ +package com.macro.mall.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +/** + * ѯ + */ +@Getter +@Setter +public class OmsOrderQueryParam { + @ApiModelProperty(value = "") + private String orderSn; + @ApiModelProperty(value = "ջ/") + private String receiverKeyword;//ջ˹ؼϢ + @ApiModelProperty(value = "״̬0->1->2->ѷ3->ɣ4->ѹرգ5->Ч") + private Integer status; + @ApiModelProperty(value = "ͣ0->1->ɱ") + private Integer orderType; + @ApiModelProperty(value = "Դ0->PC1->app") + private Integer sourceType;//Դ + @ApiModelProperty(value = "ύʱ") + private String createTime;//Ϣ +} \ No newline at end of file diff --git a/代码库/mall-admin/src/main/java/com/sock/mall/dto/OmsOrderReturnApplyResult.java b/代码库/mall-admin/src/main/java/com/sock/mall/dto/OmsOrderReturnApplyResult.java new file mode 100644 index 0000000..3b0b072 --- /dev/null +++ b/代码库/mall-admin/src/main/java/com/sock/mall/dto/OmsOrderReturnApplyResult.java @@ -0,0 +1,15 @@ +package com.macro.mall.dto; + +import com.macro.mall.model.OmsCompanyAddress; +import com.macro.mall.model.OmsOrderReturnApply; +import lombok.Getter; +import lombok.Setter; + +/** + * Ϣװ + */ +public class OmsOrderReturnApplyResult extends OmsOrderReturnApply { + @Getter + @Setter + private OmsCompanyAddress companyAddress; +} diff --git a/代码库/mall-admin/src/main/java/com/sock/mall/dto/OmsReturnApplyQueryParam.java b/代码库/mall-admin/src/main/java/com/sock/mall/dto/OmsReturnApplyQueryParam.java new file mode 100644 index 0000000..eae39e7 --- /dev/null +++ b/代码库/mall-admin/src/main/java/com/sock/mall/dto/OmsReturnApplyQueryParam.java @@ -0,0 +1,25 @@ +package com.macro.mall.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +/** + * ˻ѯ + */ +@Getter +@Setter +public class OmsReturnApplyQueryParam { + @ApiModelProperty("񵥺") + private Long id; + @ApiModelProperty(value = "ջ/") + private String receiverKeyword; + @ApiModelProperty(value = "״̬0->1->˻У2->ɣ3->Ѿܾ") + private Integer status; + @ApiModelProperty(value = "ʱ") + private String createTime; + @ApiModelProperty(value = "Ա") + private String handleMan; + @ApiModelProperty(value = "ʱ") + private String handleTime; +}