From 934937613f087077dd4c3d30cf24cb04ae4c98d9 Mon Sep 17 00:00:00 2001 From: sin <2943460818@qq.com> Date: Sat, 6 Apr 2019 23:29:12 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E9=9B=86=E6=88=90=20lombok?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/application/po/OrderDeliverPO.java | 50 +---- .../application/po/OrderItemUpdatePO.java | 50 +---- .../application/po/OrderLogisticsPO.java | 69 +----- .../order/application/po/OrderPagePO.java | 40 +--- .../application/po/OrderPageQueryPO.java | 140 +----------- order/order-service-api/pom.xml | 17 +- .../cn/iocoder/mall/order/api/bo/OrderBO.java | 151 +------------ .../mall/order/api/bo/OrderCreateBO.java | 41 +--- .../mall/order/api/bo/OrderItemBO.java | 201 +----------------- .../mall/order/api/bo/OrderLogisticsBO.java | 70 +----- .../mall/order/api/bo/OrderPageBO.java | 30 +-- .../mall/order/api/bo/OrderRecipientBO.java | 80 +------ .../mall/order/api/dto/OrderCreateDTO.java | 81 +------ .../order/api/dto/OrderCreateItemDTO.java | 25 --- .../mall/order/api/dto/OrderDeliveryDTO.java | 46 ---- .../order/api/dto/OrderItemDeletedDTO.java | 26 --- .../order/api/dto/OrderItemUpdateDTO.java | 45 ---- .../api/dto/OrderLogisticsUpdateDTO.java | 66 ------ .../mall/order/api/dto/OrderQueryDTO.java | 137 ------------ .../order/api/dto/OrderReturnCreateDTO.java | 57 ----- order/order-service-impl/pom.xml | 12 ++ .../order/biz/dataobject/OrderCancelDO.java | 60 +----- .../mall/order/biz/dataobject/OrderDO.java | 119 +---------- .../order/biz/dataobject/OrderExchangeDO.java | 169 +-------------- .../order/biz/dataobject/OrderItemDO.java | 179 +--------------- .../biz/dataobject/OrderLogisticsDO.java | 89 +------- .../dataobject/OrderLogisticsDetailDO.java | 50 +---- .../biz/dataobject/OrderRecipientDO.java | 79 +------ .../order/biz/dataobject/OrderReturnDO.java | 181 +--------------- 29 files changed, 110 insertions(+), 2250 deletions(-) diff --git a/order/order-application/src/main/java/cn/iocoder/mall/order/application/po/OrderDeliverPO.java b/order/order-application/src/main/java/cn/iocoder/mall/order/application/po/OrderDeliverPO.java index 0faa04fb..30640c77 100644 --- a/order/order-application/src/main/java/cn/iocoder/mall/order/application/po/OrderDeliverPO.java +++ b/order/order-application/src/main/java/cn/iocoder/mall/order/application/po/OrderDeliverPO.java @@ -2,6 +2,8 @@ package cn.iocoder.mall.order.application.po; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; import javax.validation.constraints.NotNull; import java.io.Serializable; @@ -13,6 +15,8 @@ import java.util.List; * @author Sin * @time 2019-04-05 16:55 */ +@Data +@Accessors(chain = true) @ApiModel(description = "订单发货PO") public class OrderDeliverPO implements Serializable { @@ -40,50 +44,4 @@ public class OrderDeliverPO implements Serializable { @ApiModelProperty("订单items") @NotNull(message = "没有选择发货的商品") private List orderItemIds; - - @Override - public String toString() { - return "OrderDeliverPO{" + - "orderId=" + orderId + - ", logistics=" + logistics + - ", logisticsNo='" + logisticsNo + '\'' + - ", orderItemIds=" + orderItemIds + - '}'; - } - - public Integer getOrderId() { - return orderId; - } - - public OrderDeliverPO setOrderId(Integer orderId) { - this.orderId = orderId; - return this; - } - - public Integer getLogistics() { - return logistics; - } - - public OrderDeliverPO setLogistics(Integer logistics) { - this.logistics = logistics; - return this; - } - - public String getLogisticsNo() { - return logisticsNo; - } - - public OrderDeliverPO setLogisticsNo(String logisticsNo) { - this.logisticsNo = logisticsNo; - return this; - } - - public List getOrderItemIds() { - return orderItemIds; - } - - public OrderDeliverPO setOrderItemIds(List orderItemIds) { - this.orderItemIds = orderItemIds; - return this; - } } diff --git a/order/order-application/src/main/java/cn/iocoder/mall/order/application/po/OrderItemUpdatePO.java b/order/order-application/src/main/java/cn/iocoder/mall/order/application/po/OrderItemUpdatePO.java index b9665f58..a7be8da4 100644 --- a/order/order-application/src/main/java/cn/iocoder/mall/order/application/po/OrderItemUpdatePO.java +++ b/order/order-application/src/main/java/cn/iocoder/mall/order/application/po/OrderItemUpdatePO.java @@ -2,6 +2,8 @@ package cn.iocoder.mall.order.application.po; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; @@ -13,6 +15,8 @@ import java.io.Serializable; * @author Sin * @time 2019-03-24 11:16 */ +@Data +@Accessors(chain = true) @ApiModel("订单item更新") public class OrderItemUpdatePO implements Serializable { @@ -42,50 +46,4 @@ public class OrderItemUpdatePO implements Serializable { @Size(max = 99999999, min = 0, message = "商品金额 0 ~ 99999999") @ApiModelProperty("商品金额") private Integer price; - - @Override - public String toString() { - return "OrderItemUpdateVO{" + - "id=" + id + - ", skuId=" + skuId + - ", quantity=" + quantity + - ", price=" + price + - '}'; - } - - public Integer getId() { - return id; - } - - public OrderItemUpdatePO setId(Integer id) { - this.id = id; - return this; - } - - public Integer getSkuId() { - return skuId; - } - - public OrderItemUpdatePO setSkuId(Integer skuId) { - this.skuId = skuId; - return this; - } - - public Integer getQuantity() { - return quantity; - } - - public OrderItemUpdatePO setQuantity(Integer quantity) { - this.quantity = quantity; - return this; - } - - public Integer getPrice() { - return price; - } - - public OrderItemUpdatePO setPrice(Integer price) { - this.price = price; - return this; - } } diff --git a/order/order-application/src/main/java/cn/iocoder/mall/order/application/po/OrderLogisticsPO.java b/order/order-application/src/main/java/cn/iocoder/mall/order/application/po/OrderLogisticsPO.java index ee7859b7..0fe5bac3 100644 --- a/order/order-application/src/main/java/cn/iocoder/mall/order/application/po/OrderLogisticsPO.java +++ b/order/order-application/src/main/java/cn/iocoder/mall/order/application/po/OrderLogisticsPO.java @@ -2,6 +2,8 @@ package cn.iocoder.mall.order.application.po; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; @@ -13,6 +15,8 @@ import java.io.Serializable; * @author Sin * @time 2019-03-24 11:01 */ +@Data +@Accessors(chain = true) @ApiModel("订单物流信息") public class OrderLogisticsPO implements Serializable { @@ -54,69 +58,4 @@ public class OrderLogisticsPO implements Serializable { @ApiModelProperty("物流订号") private String logisticsNo; - @Override - public String toString() { - return "OrderLogisticsVO{" + - "id=" + id + - ", areaNo='" + areaNo + '\'' + - ", name='" + name + '\'' + - ", mobile='" + mobile + '\'' + - ", address='" + address + '\'' + - ", logisticsNo='" + logisticsNo + '\'' + - '}'; - } - - public Integer getId() { - return id; - } - - public OrderLogisticsPO setId(Integer id) { - this.id = id; - return this; - } - - public String getAreaNo() { - return areaNo; - } - - public OrderLogisticsPO setAreaNo(String areaNo) { - this.areaNo = areaNo; - return this; - } - - public String getName() { - return name; - } - - public OrderLogisticsPO setName(String name) { - this.name = name; - return this; - } - - public String getMobile() { - return mobile; - } - - public OrderLogisticsPO setMobile(String mobile) { - this.mobile = mobile; - return this; - } - - public String getAddress() { - return address; - } - - public OrderLogisticsPO setAddress(String address) { - this.address = address; - return this; - } - - public String getLogisticsNo() { - return logisticsNo; - } - - public OrderLogisticsPO setLogisticsNo(String logisticsNo) { - this.logisticsNo = logisticsNo; - return this; - } } diff --git a/order/order-application/src/main/java/cn/iocoder/mall/order/application/po/OrderPagePO.java b/order/order-application/src/main/java/cn/iocoder/mall/order/application/po/OrderPagePO.java index eed2bd45..75d8a97f 100644 --- a/order/order-application/src/main/java/cn/iocoder/mall/order/application/po/OrderPagePO.java +++ b/order/order-application/src/main/java/cn/iocoder/mall/order/application/po/OrderPagePO.java @@ -3,6 +3,8 @@ package cn.iocoder.mall.order.application.po; import cn.iocoder.mall.order.api.bo.OrderBO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; import java.io.Serializable; import java.util.List; @@ -13,6 +15,8 @@ import java.util.List; * @author Sin * @time 2019-03-27 21:23 */ +@Data +@Accessors(chain = true) @ApiModel("订单VO") public class OrderPagePO implements Serializable { @@ -31,40 +35,4 @@ public class OrderPagePO implements Serializable { */ @ApiModelProperty("订单信息") private List orders; - - @Override - public String toString() { - return "OrderPageVO{" + - "pageNo=" + pageNo + - ", total=" + total + - ", orders=" + orders + - '}'; - } - - public Integer getPageNo() { - return pageNo; - } - - public OrderPagePO setPageNo(Integer pageNo) { - this.pageNo = pageNo; - return this; - } - - public Integer getTotal() { - return total; - } - - public OrderPagePO setTotal(Integer total) { - this.total = total; - return this; - } - - public List getOrders() { - return orders; - } - - public OrderPagePO setOrders(List orders) { - this.orders = orders; - return this; - } } diff --git a/order/order-application/src/main/java/cn/iocoder/mall/order/application/po/OrderPageQueryPO.java b/order/order-application/src/main/java/cn/iocoder/mall/order/application/po/OrderPageQueryPO.java index 5bff5949..1ef69a64 100644 --- a/order/order-application/src/main/java/cn/iocoder/mall/order/application/po/OrderPageQueryPO.java +++ b/order/order-application/src/main/java/cn/iocoder/mall/order/application/po/OrderPageQueryPO.java @@ -2,6 +2,8 @@ package cn.iocoder.mall.order.application.po; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; @@ -13,6 +15,8 @@ import java.util.Date; * @author Sin * @time 2019-03-24 10:40 */ +@Data +@Accessors(chain = true) @ApiModel("订单查询") public class OrderPageQueryPO implements Serializable { @@ -67,140 +71,4 @@ public class OrderPageQueryPO implements Serializable { private Integer pageNo; @ApiModelProperty("每页大小") private Integer pageSize; - - @Override - public String toString() { - return "OrderPageQueryVO{" + - "id=" + id + - ", orderNo='" + orderNo + '\'' + - ", userId=" + userId + - ", startPaymentTime=" + startPaymentTime + - ", endPaymentTime=" + endPaymentTime + - ", startCreateTime=" + startCreateTime + - ", endCreateTime=" + endCreateTime + - ", startClosingTime=" + startClosingTime + - ", endClosingTime=" + endClosingTime + - ", status=" + status + - ", deleted=" + deleted + - ", pageNo=" + pageNo + - ", pageSize=" + pageSize + - '}'; - } - - public Integer getId() { - return id; - } - - public OrderPageQueryPO setId(Integer id) { - this.id = id; - return this; - } - - public String getOrderNo() { - return orderNo; - } - - public OrderPageQueryPO setOrderNo(String orderNo) { - this.orderNo = orderNo; - return this; - } - - public Integer getUserId() { - return userId; - } - - public OrderPageQueryPO setUserId(Integer userId) { - this.userId = userId; - return this; - } - - public Date getStartPaymentTime() { - return startPaymentTime; - } - - public OrderPageQueryPO setStartPaymentTime(Date startPaymentTime) { - this.startPaymentTime = startPaymentTime; - return this; - } - - public Date getEndPaymentTime() { - return endPaymentTime; - } - - public OrderPageQueryPO setEndPaymentTime(Date endPaymentTime) { - this.endPaymentTime = endPaymentTime; - return this; - } - - public Date getStartCreateTime() { - return startCreateTime; - } - - public OrderPageQueryPO setStartCreateTime(Date startCreateTime) { - this.startCreateTime = startCreateTime; - return this; - } - - public Date getEndCreateTime() { - return endCreateTime; - } - - public OrderPageQueryPO setEndCreateTime(Date endCreateTime) { - this.endCreateTime = endCreateTime; - return this; - } - - public Date getStartClosingTime() { - return startClosingTime; - } - - public OrderPageQueryPO setStartClosingTime(Date startClosingTime) { - this.startClosingTime = startClosingTime; - return this; - } - - public Date getEndClosingTime() { - return endClosingTime; - } - - public OrderPageQueryPO setEndClosingTime(Date endClosingTime) { - this.endClosingTime = endClosingTime; - return this; - } - - public Integer getStatus() { - return status; - } - - public OrderPageQueryPO setStatus(Integer status) { - this.status = status; - return this; - } - - public Integer getDeleted() { - return deleted; - } - - public OrderPageQueryPO setDeleted(Integer deleted) { - this.deleted = deleted; - return this; - } - - public Integer getPageNo() { - return pageNo; - } - - public OrderPageQueryPO setPageNo(Integer pageNo) { - this.pageNo = pageNo; - return this; - } - - public Integer getPageSize() { - return pageSize; - } - - public OrderPageQueryPO setPageSize(Integer pageSize) { - this.pageSize = pageSize; - return this; - } } diff --git a/order/order-service-api/pom.xml b/order/order-service-api/pom.xml index 25a2d626..e3f49d1d 100644 --- a/order/order-service-api/pom.xml +++ b/order/order-service-api/pom.xml @@ -11,16 +11,25 @@ order-service-api + + 1.16.14 + + - - javax.validation - validation-api - cn.iocoder.mall common-framework 1.0-SNAPSHOT compile + + javax.validation + validation-api + + + org.projectlombok + lombok + ${org.projectlombok.version} + \ No newline at end of file diff --git a/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/bo/OrderBO.java b/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/bo/OrderBO.java index b483ab3b..fad41763 100644 --- a/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/bo/OrderBO.java +++ b/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/bo/OrderBO.java @@ -1,5 +1,8 @@ package cn.iocoder.mall.order.api.bo; +import lombok.Data; +import lombok.experimental.Accessors; + import java.io.Serializable; import java.util.Date; import java.util.List; @@ -10,6 +13,8 @@ import java.util.List; * @author Sin * @time 2019-03-23 14:30 */ +@Data +@Accessors(chain = true) public class OrderBO implements Serializable { /** @@ -91,150 +96,4 @@ public class OrderBO implements Serializable { * 订单物流信息 */ private OrderRecipientBO orderRecipient; - - @Override - public String toString() { - return "OrderBO{" + - "id=" + id + - ", userId=" + userId + - ", orderLogisticsId=" + orderLogisticsId + - ", orderNo='" + orderNo + '\'' + - ", payAmount=" + payAmount + - ", paymentTime=" + paymentTime + - ", deliveryTime=" + deliveryTime + - ", receiverTime=" + receiverTime + - ", closingTime=" + closingTime + - ", hasReturnExchange=" + hasReturnExchange + - ", status=" + status + - ", remark='" + remark + '\'' + - ", orderItems=" + orderItems + - ", orderRecipient=" + orderRecipient + - '}'; - } - - public Integer getId() { - return id; - } - - public OrderBO setId(Integer id) { - this.id = id; - return this; - } - - public Integer getUserId() { - return userId; - } - - public OrderBO setUserId(Integer userId) { - this.userId = userId; - return this; - } - - public Integer getOrderLogisticsId() { - return orderLogisticsId; - } - - public OrderBO setOrderLogisticsId(Integer orderLogisticsId) { - this.orderLogisticsId = orderLogisticsId; - return this; - } - - public String getOrderNo() { - return orderNo; - } - - public OrderBO setOrderNo(String orderNo) { - this.orderNo = orderNo; - return this; - } - - public Integer getPayAmount() { - return payAmount; - } - - public OrderBO setPayAmount(Integer payAmount) { - this.payAmount = payAmount; - return this; - } - - public Date getPaymentTime() { - return paymentTime; - } - - public OrderBO setPaymentTime(Date paymentTime) { - this.paymentTime = paymentTime; - return this; - } - - public Date getDeliveryTime() { - return deliveryTime; - } - - public OrderBO setDeliveryTime(Date deliveryTime) { - this.deliveryTime = deliveryTime; - return this; - } - - public Date getReceiverTime() { - return receiverTime; - } - - public OrderBO setReceiverTime(Date receiverTime) { - this.receiverTime = receiverTime; - return this; - } - - public Date getClosingTime() { - return closingTime; - } - - public OrderBO setClosingTime(Date closingTime) { - this.closingTime = closingTime; - return this; - } - - public Integer getHasReturnExchange() { - return hasReturnExchange; - } - - public OrderBO setHasReturnExchange(Integer hasReturnExchange) { - this.hasReturnExchange = hasReturnExchange; - return this; - } - - public Integer getStatus() { - return status; - } - - public OrderBO setStatus(Integer status) { - this.status = status; - return this; - } - - public String getRemark() { - return remark; - } - - public OrderBO setRemark(String remark) { - this.remark = remark; - return this; - } - - public List getOrderItems() { - return orderItems; - } - - public OrderBO setOrderItems(List orderItems) { - this.orderItems = orderItems; - return this; - } - - public OrderRecipientBO getOrderRecipient() { - return orderRecipient; - } - - public OrderBO setOrderRecipient(OrderRecipientBO orderRecipient) { - this.orderRecipient = orderRecipient; - return this; - } } diff --git a/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/bo/OrderCreateBO.java b/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/bo/OrderCreateBO.java index 8c97b4f4..0bae929a 100644 --- a/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/bo/OrderCreateBO.java +++ b/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/bo/OrderCreateBO.java @@ -1,5 +1,8 @@ package cn.iocoder.mall.order.api.bo; +import lombok.Data; +import lombok.experimental.Accessors; + import java.io.Serializable; /** @@ -8,6 +11,8 @@ import java.io.Serializable; * @author Sin * @time 2019-03-16 14:38 */ +@Data +@Accessors(chain = true) public class OrderCreateBO implements Serializable { /** @@ -22,40 +27,4 @@ public class OrderCreateBO implements Serializable { * 订单金额 */ private Integer payAmount; - - @Override - public String toString() { - return "OrderCreateBO{" + - "id=" + id + - ", orderNo='" + orderNo + '\'' + - ", payAmount=" + payAmount + - '}'; - } - - public Integer getId() { - return id; - } - - public OrderCreateBO setId(Integer id) { - this.id = id; - return this; - } - - public String getOrderNo() { - return orderNo; - } - - public OrderCreateBO setOrderNo(String orderNo) { - this.orderNo = orderNo; - return this; - } - - public Integer getPayAmount() { - return payAmount; - } - - public OrderCreateBO setPayAmount(Integer payAmount) { - this.payAmount = payAmount; - return this; - } } diff --git a/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/bo/OrderItemBO.java b/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/bo/OrderItemBO.java index c6e39043..3a6d196c 100644 --- a/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/bo/OrderItemBO.java +++ b/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/bo/OrderItemBO.java @@ -1,5 +1,8 @@ package cn.iocoder.mall.order.api.bo; +import lombok.Data; +import lombok.experimental.Accessors; + import java.io.Serializable; import java.util.Date; @@ -9,6 +12,8 @@ import java.util.Date; * @author Sin * @time 2019-03-28 21:11 */ +@Data +@Accessors(chain = true) public class OrderItemBO implements Serializable { /** @@ -112,200 +117,4 @@ public class OrderItemBO implements Serializable { * 删除状态 */ private Integer deleted; - - @Override - public String toString() { - return "OrderItemBO{" + - "id=" + id + - ", orderId=" + orderId + - ", orderNo='" + orderNo + '\'' + - ", skuId=" + skuId + - ", skuName='" + skuName + '\'' + - ", skuImage='" + skuImage + '\'' + - ", quantity=" + quantity + - ", price=" + price + - ", payAmount=" + payAmount + - ", paymentTime=" + paymentTime + - ", deliveryTime=" + deliveryTime + - ", receiverTime=" + receiverTime + - ", closingTime=" + closingTime + - ", hasReturnExchange=" + hasReturnExchange + - ", deliveryType=" + deliveryType + - ", status=" + status + - ", createTime=" + createTime + - ", updateTime=" + updateTime + - ", deleted=" + deleted + - '}'; - } - - public Integer getId() { - return id; - } - - public OrderItemBO setId(Integer id) { - this.id = id; - return this; - } - - public Integer getOrderId() { - return orderId; - } - - public OrderItemBO setOrderId(Integer orderId) { - this.orderId = orderId; - return this; - } - - public String getOrderNo() { - return orderNo; - } - - public OrderItemBO setOrderNo(String orderNo) { - this.orderNo = orderNo; - return this; - } - - public Integer getSkuId() { - return skuId; - } - - public OrderItemBO setSkuId(Integer skuId) { - this.skuId = skuId; - return this; - } - - public String getSkuName() { - return skuName; - } - - public OrderItemBO setSkuName(String skuName) { - this.skuName = skuName; - return this; - } - - public String getSkuImage() { - return skuImage; - } - - public OrderItemBO setSkuImage(String skuImage) { - this.skuImage = skuImage; - return this; - } - - public Integer getQuantity() { - return quantity; - } - - public OrderItemBO setQuantity(Integer quantity) { - this.quantity = quantity; - return this; - } - - public Integer getPrice() { - return price; - } - - public OrderItemBO setPrice(Integer price) { - this.price = price; - return this; - } - - public Integer getPayAmount() { - return payAmount; - } - - public OrderItemBO setPayAmount(Integer payAmount) { - this.payAmount = payAmount; - return this; - } - - public Date getPaymentTime() { - return paymentTime; - } - - public OrderItemBO setPaymentTime(Date paymentTime) { - this.paymentTime = paymentTime; - return this; - } - - public Date getDeliveryTime() { - return deliveryTime; - } - - public OrderItemBO setDeliveryTime(Date deliveryTime) { - this.deliveryTime = deliveryTime; - return this; - } - - public Date getReceiverTime() { - return receiverTime; - } - - public OrderItemBO setReceiverTime(Date receiverTime) { - this.receiverTime = receiverTime; - return this; - } - - public Date getClosingTime() { - return closingTime; - } - - public OrderItemBO setClosingTime(Date closingTime) { - this.closingTime = closingTime; - return this; - } - - public Integer getHasReturnExchange() { - return hasReturnExchange; - } - - public OrderItemBO setHasReturnExchange(Integer hasReturnExchange) { - this.hasReturnExchange = hasReturnExchange; - return this; - } - - public Integer getDeliveryType() { - return deliveryType; - } - - public OrderItemBO setDeliveryType(Integer deliveryType) { - this.deliveryType = deliveryType; - return this; - } - - public Integer getStatus() { - return status; - } - - public OrderItemBO setStatus(Integer status) { - this.status = status; - return this; - } - - public Date getCreateTime() { - return createTime; - } - - public OrderItemBO setCreateTime(Date createTime) { - this.createTime = createTime; - return this; - } - - public Date getUpdateTime() { - return updateTime; - } - - public OrderItemBO setUpdateTime(Date updateTime) { - this.updateTime = updateTime; - return this; - } - - public Integer getDeleted() { - return deleted; - } - - public OrderItemBO setDeleted(Integer deleted) { - this.deleted = deleted; - return this; - } } diff --git a/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/bo/OrderLogisticsBO.java b/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/bo/OrderLogisticsBO.java index 5786e324..4d617dcc 100644 --- a/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/bo/OrderLogisticsBO.java +++ b/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/bo/OrderLogisticsBO.java @@ -1,6 +1,8 @@ package cn.iocoder.mall.order.api.bo; import cn.iocoder.common.framework.dataobject.BaseDO; +import lombok.Data; +import lombok.experimental.Accessors; /** * 订单物流信息 @@ -8,6 +10,8 @@ import cn.iocoder.common.framework.dataobject.BaseDO; * @author Sin * @time 2019-03-19 20:47 */ +@Data +@Accessors(chain = true) public class OrderLogisticsBO extends BaseDO { /** @@ -34,70 +38,4 @@ public class OrderLogisticsBO extends BaseDO { * 物流编号 */ private String logisticsNo; - - @Override - public String toString() { - return "OrderLogisticsDO{" + - "id=" + id + - ", areaNo='" + areaNo + '\'' + - ", name='" + name + '\'' + - ", mobile='" + mobile + '\'' + - ", address='" + address + '\'' + - ", logisticsNo='" + logisticsNo + '\'' + - '}'; - } - - public Integer getId() { - return id; - } - - public OrderLogisticsBO setId(Integer id) { - this.id = id; - return this; - } - - public String getAreaNo() { - return areaNo; - } - - public OrderLogisticsBO setAreaNo(String areaNo) { - this.areaNo = areaNo; - return this; - } - - public String getName() { - return name; - } - - public OrderLogisticsBO setName(String name) { - this.name = name; - return this; - } - - public String getMobile() { - return mobile; - } - - public OrderLogisticsBO setMobile(String mobile) { - this.mobile = mobile; - return this; - } - - public String getAddress() { - return address; - } - - public OrderLogisticsBO setAddress(String address) { - this.address = address; - return this; - } - - public String getLogisticsNo() { - return logisticsNo; - } - - public OrderLogisticsBO setLogisticsNo(String logisticsNo) { - this.logisticsNo = logisticsNo; - return this; - } } diff --git a/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/bo/OrderPageBO.java b/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/bo/OrderPageBO.java index 7bfe8b91..685013c4 100644 --- a/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/bo/OrderPageBO.java +++ b/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/bo/OrderPageBO.java @@ -1,5 +1,8 @@ package cn.iocoder.mall.order.api.bo; +import lombok.Data; +import lombok.experimental.Accessors; + import java.io.Serializable; import java.util.List; @@ -9,6 +12,8 @@ import java.util.List; * @author Sin * @time 2019-03-27 21:27 */ +@Data +@Accessors(chain = true) public class OrderPageBO implements Serializable { /** @@ -20,29 +25,4 @@ public class OrderPageBO implements Serializable { */ private List orders; - @Override - public String toString() { - return "OrderPageBO{" + - "total=" + total + - ", orders=" + orders + - '}'; - } - - public Integer getTotal() { - return total; - } - - public OrderPageBO setTotal(Integer total) { - this.total = total; - return this; - } - - public List getOrders() { - return orders; - } - - public OrderPageBO setOrders(List orders) { - this.orders = orders; - return this; - } } diff --git a/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/bo/OrderRecipientBO.java b/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/bo/OrderRecipientBO.java index e212b41e..62e44a18 100644 --- a/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/bo/OrderRecipientBO.java +++ b/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/bo/OrderRecipientBO.java @@ -1,6 +1,8 @@ package cn.iocoder.mall.order.api.bo; import cn.iocoder.common.framework.dataobject.BaseDO; +import lombok.Data; +import lombok.experimental.Accessors; /** * 订单收件人信息 order_recipient @@ -8,6 +10,8 @@ import cn.iocoder.common.framework.dataobject.BaseDO; * @author Sin * @time 2019-03-31 11:37 */ +@Data +@Accessors(chain = true) public class OrderRecipientBO extends BaseDO { /** @@ -38,80 +42,4 @@ public class OrderRecipientBO extends BaseDO { * 收件详细地址 */ private String address; - - @Override - public String toString() { - return "OrderRecipientBO{" + - "id=" + id + - ", orderId=" + orderId + - ", areaNo='" + areaNo + '\'' + - ", name='" + name + '\'' + - ", mobile='" + mobile + '\'' + - ", type=" + type + - ", address='" + address + '\'' + - '}'; - } - - public Integer getId() { - return id; - } - - public OrderRecipientBO setId(Integer id) { - this.id = id; - return this; - } - - public Integer getOrderId() { - return orderId; - } - - public OrderRecipientBO setOrderId(Integer orderId) { - this.orderId = orderId; - return this; - } - - public String getAreaNo() { - return areaNo; - } - - public OrderRecipientBO setAreaNo(String areaNo) { - this.areaNo = areaNo; - return this; - } - - public String getName() { - return name; - } - - public OrderRecipientBO setName(String name) { - this.name = name; - return this; - } - - public String getMobile() { - return mobile; - } - - public OrderRecipientBO setMobile(String mobile) { - this.mobile = mobile; - return this; - } - - public Integer getType() { - return type; - } - - public OrderRecipientBO setType(Integer type) { - this.type = type; - return this; - } - - public String getAddress() { - return address; - } - - public OrderRecipientBO setAddress(String address) { - this.address = address; - return this; - } } diff --git a/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/dto/OrderCreateDTO.java b/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/dto/OrderCreateDTO.java index 42a175f2..4b173b95 100644 --- a/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/dto/OrderCreateDTO.java +++ b/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/dto/OrderCreateDTO.java @@ -1,5 +1,8 @@ package cn.iocoder.mall.order.api.dto; +import lombok.Data; +import lombok.experimental.Accessors; + import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import java.io.Serializable; @@ -11,6 +14,8 @@ import java.util.List; * @author Sin * @time 2019-03-16 14:42 */ +@Data +@Accessors(chain = true) public class OrderCreateDTO implements Serializable { /** @@ -48,80 +53,4 @@ public class OrderCreateDTO implements Serializable { @NotNull @Size(max = 1000, min = 1) private List orderItems; - - @Override - public String toString() { - return "OrderCreateDTO{" + - "userId=" + userId + - ", areaNo='" + areaNo + '\'' + - ", name='" + name + '\'' + - ", mobile='" + mobile + '\'' + - ", address='" + address + '\'' + - ", remark='" + remark + '\'' + - ", orderItems=" + orderItems + - '}'; - } - - public Integer getUserId() { - return userId; - } - - public OrderCreateDTO setUserId(Integer userId) { - this.userId = userId; - return this; - } - - public String getAreaNo() { - return areaNo; - } - - public OrderCreateDTO setAreaNo(String areaNo) { - this.areaNo = areaNo; - return this; - } - - public String getName() { - return name; - } - - public OrderCreateDTO setName(String name) { - this.name = name; - return this; - } - - public String getMobile() { - return mobile; - } - - public OrderCreateDTO setMobile(String mobile) { - this.mobile = mobile; - return this; - } - - public String getAddress() { - return address; - } - - public OrderCreateDTO setAddress(String address) { - this.address = address; - return this; - } - - public String getRemark() { - return remark; - } - - public OrderCreateDTO setRemark(String remark) { - this.remark = remark; - return this; - } - - public List getOrderItems() { - return orderItems; - } - - public OrderCreateDTO setOrderItems(List orderItems) { - this.orderItems = orderItems; - return this; - } } diff --git a/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/dto/OrderCreateItemDTO.java b/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/dto/OrderCreateItemDTO.java index 06f1be11..08815c1a 100644 --- a/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/dto/OrderCreateItemDTO.java +++ b/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/dto/OrderCreateItemDTO.java @@ -21,29 +21,4 @@ public class OrderCreateItemDTO { @Max(value = 1000) private Integer quantity; - @Override - public String toString() { - return "OrderCreateItemDTO{" + - "skuId='" + skuId + '\'' + - ", quantity=" + quantity + - '}'; - } - - public Integer getSkuId() { - return skuId; - } - - public OrderCreateItemDTO setSkuId(Integer skuId) { - this.skuId = skuId; - return this; - } - - public Integer getQuantity() { - return quantity; - } - - public OrderCreateItemDTO setQuantity(Integer quantity) { - this.quantity = quantity; - return this; - } } diff --git a/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/dto/OrderDeliveryDTO.java b/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/dto/OrderDeliveryDTO.java index f5dea8ee..8abff551 100644 --- a/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/dto/OrderDeliveryDTO.java +++ b/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/dto/OrderDeliveryDTO.java @@ -31,50 +31,4 @@ public class OrderDeliveryDTO implements Serializable { * 订单 orderItemId */ private List orderItemIds; - - @Override - public String toString() { - return "OrderDeliveryDTO{" + - "orderId=" + orderId + - ", logistics=" + logistics + - ", logisticsNo='" + logisticsNo + '\'' + - ", orderItemIds=" + orderItemIds + - '}'; - } - - public Integer getOrderId() { - return orderId; - } - - public OrderDeliveryDTO setOrderId(Integer orderId) { - this.orderId = orderId; - return this; - } - - public Integer getLogistics() { - return logistics; - } - - public OrderDeliveryDTO setLogistics(Integer logistics) { - this.logistics = logistics; - return this; - } - - public String getLogisticsNo() { - return logisticsNo; - } - - public OrderDeliveryDTO setLogisticsNo(String logisticsNo) { - this.logisticsNo = logisticsNo; - return this; - } - - public List getOrderItemIds() { - return orderItemIds; - } - - public OrderDeliveryDTO setOrderItemIds(List orderItemIds) { - this.orderItemIds = orderItemIds; - return this; - } } diff --git a/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/dto/OrderItemDeletedDTO.java b/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/dto/OrderItemDeletedDTO.java index b1409ceb..e76d4eb6 100644 --- a/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/dto/OrderItemDeletedDTO.java +++ b/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/dto/OrderItemDeletedDTO.java @@ -17,30 +17,4 @@ public class OrderItemDeletedDTO implements Serializable { * 订单item id */ private List orderItemIds; - - @Override - public String toString() { - return "OrderItemDeletedDTO{" + - "orderId=" + orderId + - ", orderItemIds=" + orderItemIds + - '}'; - } - - public Integer getOrderId() { - return orderId; - } - - public OrderItemDeletedDTO setOrderId(Integer orderId) { - this.orderId = orderId; - return this; - } - - public List getOrderItemIds() { - return orderItemIds; - } - - public OrderItemDeletedDTO setOrderItemIds(List orderItemIds) { - this.orderItemIds = orderItemIds; - return this; - } } diff --git a/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/dto/OrderItemUpdateDTO.java b/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/dto/OrderItemUpdateDTO.java index 40480207..c014c3ce 100644 --- a/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/dto/OrderItemUpdateDTO.java +++ b/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/dto/OrderItemUpdateDTO.java @@ -32,49 +32,4 @@ public class OrderItemUpdateDTO implements Serializable { @NotNull private Integer price; - @Override - public String toString() { - return "OrderItemUpdateDTO{" + - "id=" + id + - ", skuId=" + skuId + - ", quantity=" + quantity + - ", price=" + price + - '}'; - } - - public Integer getId() { - return id; - } - - public OrderItemUpdateDTO setId(Integer id) { - this.id = id; - return this; - } - - public Integer getSkuId() { - return skuId; - } - - public OrderItemUpdateDTO setSkuId(Integer skuId) { - this.skuId = skuId; - return this; - } - - public Integer getQuantity() { - return quantity; - } - - public OrderItemUpdateDTO setQuantity(Integer quantity) { - this.quantity = quantity; - return this; - } - - public Integer getPrice() { - return price; - } - - public OrderItemUpdateDTO setPrice(Integer price) { - this.price = price; - return this; - } } diff --git a/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/dto/OrderLogisticsUpdateDTO.java b/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/dto/OrderLogisticsUpdateDTO.java index bf5030bc..b1b33fe6 100644 --- a/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/dto/OrderLogisticsUpdateDTO.java +++ b/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/dto/OrderLogisticsUpdateDTO.java @@ -43,70 +43,4 @@ public class OrderLogisticsUpdateDTO implements Serializable { * 物流编号 */ private String logisticsNo; - - @Override - public String toString() { - return "OrderLogisticsDTO{" + - "id=" + id + - ", areaNo='" + areaNo + '\'' + - ", name='" + name + '\'' + - ", mobile='" + mobile + '\'' + - ", address='" + address + '\'' + - ", logisticsNo='" + logisticsNo + '\'' + - '}'; - } - - public Integer getId() { - return id; - } - - public OrderLogisticsUpdateDTO setId(Integer id) { - this.id = id; - return this; - } - - public String getAreaNo() { - return areaNo; - } - - public OrderLogisticsUpdateDTO setAreaNo(String areaNo) { - this.areaNo = areaNo; - return this; - } - - public String getName() { - return name; - } - - public OrderLogisticsUpdateDTO setName(String name) { - this.name = name; - return this; - } - - public String getMobile() { - return mobile; - } - - public OrderLogisticsUpdateDTO setMobile(String mobile) { - this.mobile = mobile; - return this; - } - - public String getAddress() { - return address; - } - - public OrderLogisticsUpdateDTO setAddress(String address) { - this.address = address; - return this; - } - - public String getLogisticsNo() { - return logisticsNo; - } - - public OrderLogisticsUpdateDTO setLogisticsNo(String logisticsNo) { - this.logisticsNo = logisticsNo; - return this; - } } diff --git a/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/dto/OrderQueryDTO.java b/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/dto/OrderQueryDTO.java index f911711b..220ee7fc 100644 --- a/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/dto/OrderQueryDTO.java +++ b/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/dto/OrderQueryDTO.java @@ -1,6 +1,5 @@ package cn.iocoder.mall.order.api.dto; -import javax.validation.constraints.NotNull; import java.io.Serializable; import java.util.Date; @@ -52,140 +51,4 @@ public class OrderQueryDTO implements Serializable { private Integer status; private Integer pageNo; private Integer pageSize; - - @Override - public String toString() { - return "OrderQueryDTO{" + - "id=" + id + - ", orderNo='" + orderNo + '\'' + - ", userId=" + userId + - ", orderLogisticsId=" + orderLogisticsId + - ", hasReturnExchange=" + hasReturnExchange + - ", startPaymentTime=" + startPaymentTime + - ", endPaymentTime=" + endPaymentTime + - ", startCreateTime=" + startCreateTime + - ", endCreateTime=" + endCreateTime + - ", deleted=" + deleted + - ", status=" + status + - ", pageNo=" + pageNo + - ", pageSize=" + pageSize + - '}'; - } - - public Integer getId() { - return id; - } - - public OrderQueryDTO setId(Integer id) { - this.id = id; - return this; - } - - public String getOrderNo() { - return orderNo; - } - - public OrderQueryDTO setOrderNo(String orderNo) { - this.orderNo = orderNo; - return this; - } - - public Integer getUserId() { - return userId; - } - - public OrderQueryDTO setUserId(Integer userId) { - this.userId = userId; - return this; - } - - public Integer getOrderLogisticsId() { - return orderLogisticsId; - } - - public OrderQueryDTO setOrderLogisticsId(Integer orderLogisticsId) { - this.orderLogisticsId = orderLogisticsId; - return this; - } - - public Integer getHasReturnExchange() { - return hasReturnExchange; - } - - public OrderQueryDTO setHasReturnExchange(Integer hasReturnExchange) { - this.hasReturnExchange = hasReturnExchange; - return this; - } - - public Date getStartPaymentTime() { - return startPaymentTime; - } - - public OrderQueryDTO setStartPaymentTime(Date startPaymentTime) { - this.startPaymentTime = startPaymentTime; - return this; - } - - public Date getEndPaymentTime() { - return endPaymentTime; - } - - public OrderQueryDTO setEndPaymentTime(Date endPaymentTime) { - this.endPaymentTime = endPaymentTime; - return this; - } - - public Date getStartCreateTime() { - return startCreateTime; - } - - public OrderQueryDTO setStartCreateTime(Date startCreateTime) { - this.startCreateTime = startCreateTime; - return this; - } - - public Date getEndCreateTime() { - return endCreateTime; - } - - public OrderQueryDTO setEndCreateTime(Date endCreateTime) { - this.endCreateTime = endCreateTime; - return this; - } - - public Integer getDeleted() { - return deleted; - } - - public OrderQueryDTO setDeleted(Integer deleted) { - this.deleted = deleted; - return this; - } - - public Integer getStatus() { - return status; - } - - public OrderQueryDTO setStatus(Integer status) { - this.status = status; - return this; - } - - public Integer getPageNo() { - return pageNo; - } - - public OrderQueryDTO setPageNo(Integer pageNo) { - this.pageNo = pageNo; - return this; - } - - public Integer getPageSize() { - return pageSize; - } - - public OrderQueryDTO setPageSize(Integer pageSize) { - this.pageSize = pageSize; - return this; - } } diff --git a/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/dto/OrderReturnCreateDTO.java b/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/dto/OrderReturnCreateDTO.java index 8c82d921..6a990d74 100644 --- a/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/dto/OrderReturnCreateDTO.java +++ b/order/order-service-api/src/main/java/cn/iocoder/mall/order/api/dto/OrderReturnCreateDTO.java @@ -1,7 +1,6 @@ package cn.iocoder.mall.order.api.dto; import java.io.Serializable; -import java.util.Date; /** * 订单退货 - 创建 @@ -34,60 +33,4 @@ public class OrderReturnCreateDTO implements Serializable { * - 1、为 OrderItem 订单 （对订单某一个商品退货） */ private Integer orderType; - - @Override - public String toString() { - return "OrderReturnCreateDTO{" + - "orderId=" + orderId + - ", orderItemId=" + orderItemId + - ", orderReason=" + orderReason + - ", otherReasons='" + otherReasons + '\'' + - ", orderType=" + orderType + - '}'; - } - - public Integer getOrderId() { - return orderId; - } - - public OrderReturnCreateDTO setOrderId(Integer orderId) { - this.orderId = orderId; - return this; - } - - public Integer getOrderItemId() { - return orderItemId; - } - - public OrderReturnCreateDTO setOrderItemId(Integer orderItemId) { - this.orderItemId = orderItemId; - return this; - } - - public Integer getOrderReason() { - return orderReason; - } - - public OrderReturnCreateDTO setOrderReason(Integer orderReason) { - this.orderReason = orderReason; - return this; - } - - public String getOtherReasons() { - return otherReasons; - } - - public OrderReturnCreateDTO setOtherReasons(String otherReasons) { - this.otherReasons = otherReasons; - return this; - } - - public Integer getOrderType() { - return orderType; - } - - public OrderReturnCreateDTO setOrderType(Integer orderType) { - this.orderType = orderType; - return this; - } } diff --git a/order/order-service-impl/pom.xml b/order/order-service-impl/pom.xml index 4f94a08a..27038197 100644 --- a/order/order-service-impl/pom.xml +++ b/order/order-service-impl/pom.xml @@ -13,6 +13,7 @@ 1.3.0.Final + 1.16.14 @@ -58,6 +59,12 @@ ${org.mapstruct.version} + + org.projectlombok + lombok + ${org.projectlombok.version} + + com.google.guava guava @@ -119,6 +126,11 @@ mapstruct-processor ${org.mapstruct.version} + + org.projectlombok + lombok + ${org.projectlombok.version} + diff --git a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderCancelDO.java b/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderCancelDO.java index cf860b35..5f832e2d 100644 --- a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderCancelDO.java +++ b/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderCancelDO.java @@ -1,6 +1,8 @@ package cn.iocoder.mall.order.biz.dataobject; import cn.iocoder.common.framework.dataobject.BaseDO; +import lombok.Data; +import lombok.experimental.Accessors; import java.io.Serializable; @@ -14,6 +16,8 @@ import java.io.Serializable; * @author Sin * @time 2019-03-30 16:20 */ +@Data +@Accessors(chain = true) public class OrderCancelDO extends BaseDO { /** @@ -36,60 +40,4 @@ public class OrderCancelDO extends BaseDO { * 原因（如果选择其他，原因保存在这） */ private String otherReason; - - @Override - public String toString() { - return "OrderCancelDO{" + - "id=" + id + - ", orderId=" + orderId + - ", orderNo='" + orderNo + '\'' + - ", reason=" + reason + - ", otherReason='" + otherReason + '\'' + - '}'; - } - - public Integer getId() { - return id; - } - - public OrderCancelDO setId(Integer id) { - this.id = id; - return this; - } - - public Integer getOrderId() { - return orderId; - } - - public OrderCancelDO setOrderId(Integer orderId) { - this.orderId = orderId; - return this; - } - - public String getOrderNo() { - return orderNo; - } - - public OrderCancelDO setOrderNo(String orderNo) { - this.orderNo = orderNo; - return this; - } - - public Integer getReason() { - return reason; - } - - public OrderCancelDO setReason(Integer reason) { - this.reason = reason; - return this; - } - - public String getOtherReason() { - return otherReason; - } - - public OrderCancelDO setOtherReason(String otherReason) { - this.otherReason = otherReason; - return this; - } } diff --git a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderDO.java b/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderDO.java index 83a956e2..40d1bbbd 100644 --- a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderDO.java +++ b/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderDO.java @@ -1,6 +1,8 @@ package cn.iocoder.mall.order.biz.dataobject; import cn.iocoder.common.framework.dataobject.DeletableDO; +import lombok.Data; +import lombok.experimental.Accessors; import java.util.Date; @@ -10,6 +12,8 @@ import java.util.Date; * @author Sin * @time 2019-03-16 13:49 */ +@Data +@Accessors(chain = true) public class OrderDO extends DeletableDO { /** @@ -76,119 +80,4 @@ public class OrderDO extends DeletableDO { */ private String remark; - @Override - public String toString() { - return "OrderDO{" + - "id=" + id + - ", userId=" + userId + - ", orderNo='" + orderNo + '\'' + - ", payAmount=" + payAmount + - ", paymentTime=" + paymentTime + - ", deliveryTime=" + deliveryTime + - ", receiverTime=" + receiverTime + - ", closingTime=" + closingTime + - ", hasReturnExchange=" + hasReturnExchange + - ", status=" + status + - ", remark='" + remark + '\'' + - '}'; - } - - public Integer getId() { - return id; - } - - public OrderDO setId(Integer id) { - this.id = id; - return this; - } - - public Integer getUserId() { - return userId; - } - - public OrderDO setUserId(Integer userId) { - this.userId = userId; - return this; - } - - public String getOrderNo() { - return orderNo; - } - - public OrderDO setOrderNo(String orderNo) { - this.orderNo = orderNo; - return this; - } - - public Integer getPayAmount() { - return payAmount; - } - - public OrderDO setPayAmount(Integer payAmount) { - this.payAmount = payAmount; - return this; - } - - public Date getPaymentTime() { - return paymentTime; - } - - public OrderDO setPaymentTime(Date paymentTime) { - this.paymentTime = paymentTime; - return this; - } - - public Date getDeliveryTime() { - return deliveryTime; - } - - public OrderDO setDeliveryTime(Date deliveryTime) { - this.deliveryTime = deliveryTime; - return this; - } - - public Date getReceiverTime() { - return receiverTime; - } - - public OrderDO setReceiverTime(Date receiverTime) { - this.receiverTime = receiverTime; - return this; - } - - public Date getClosingTime() { - return closingTime; - } - - public OrderDO setClosingTime(Date closingTime) { - this.closingTime = closingTime; - return this; - } - - public Integer getHasReturnExchange() { - return hasReturnExchange; - } - - public OrderDO setHasReturnExchange(Integer hasReturnExchange) { - this.hasReturnExchange = hasReturnExchange; - return this; - } - - public Integer getStatus() { - return status; - } - - public OrderDO setStatus(Integer status) { - this.status = status; - return this; - } - - public String getRemark() { - return remark; - } - - public OrderDO setRemark(String remark) { - this.remark = remark; - return this; - } } diff --git a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderExchangeDO.java b/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderExchangeDO.java index cdee3208..65be8c83 100644 --- a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderExchangeDO.java +++ b/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderExchangeDO.java @@ -1,6 +1,8 @@ package cn.iocoder.mall.order.biz.dataobject; import cn.iocoder.common.framework.dataobject.DeletableDO; +import lombok.Data; +import lombok.experimental.Accessors; import java.util.Date; @@ -10,6 +12,8 @@ import java.util.Date; * @author Sin * @time 2019-03-19 19:48 */ +@Data +@Accessors(chain = true) public class OrderExchangeDO extends DeletableDO { /** @@ -107,169 +111,4 @@ public class OrderExchangeDO extends DeletableDO { */ private Integer status; - @Override - public String toString() { - return "OrderExchangeDO{" + - "id=" + id + - ", orderId=" + orderId + - ", orderNo='" + orderNo + '\'' + - ", orderItemId=" + orderItemId + - ", skuId='" + skuId + '\'' + - ", exchangeSkuId='" + exchangeSkuId + '\'' + - ", exchangeOrderLogisticsId=" + exchangeOrderLogisticsId + - ", receiverOrderLogisticsId=" + receiverOrderLogisticsId + - ", orderReasonId=" + orderReasonId + - ", reason='" + reason + '\'' + - ", paymentTime=" + paymentTime + - ", deliveryTime=" + deliveryTime + - ", receiverTime=" + receiverTime + - ", closingTime=" + closingTime + - ", orderType=" + orderType + - ", status=" + status + - '}'; - } - - public Integer getId() { - return id; - } - - public OrderExchangeDO setId(Integer id) { - this.id = id; - return this; - } - - public Integer getOrderId() { - return orderId; - } - - public OrderExchangeDO setOrderId(Integer orderId) { - this.orderId = orderId; - return this; - } - - public String getOrderNo() { - return orderNo; - } - - public OrderExchangeDO setOrderNo(String orderNo) { - this.orderNo = orderNo; - return this; - } - - public Integer getOrderItemId() { - return orderItemId; - } - - public OrderExchangeDO setOrderItemId(Integer orderItemId) { - this.orderItemId = orderItemId; - return this; - } - - public String getSkuId() { - return skuId; - } - - public OrderExchangeDO setSkuId(String skuId) { - this.skuId = skuId; - return this; - } - - public String getExchangeSkuId() { - return exchangeSkuId; - } - - public OrderExchangeDO setExchangeSkuId(String exchangeSkuId) { - this.exchangeSkuId = exchangeSkuId; - return this; - } - - public Integer getExchangeOrderLogisticsId() { - return exchangeOrderLogisticsId; - } - - public OrderExchangeDO setExchangeOrderLogisticsId(Integer exchangeOrderLogisticsId) { - this.exchangeOrderLogisticsId = exchangeOrderLogisticsId; - return this; - } - - public Integer getReceiverOrderLogisticsId() { - return receiverOrderLogisticsId; - } - - public OrderExchangeDO setReceiverOrderLogisticsId(Integer receiverOrderLogisticsId) { - this.receiverOrderLogisticsId = receiverOrderLogisticsId; - return this; - } - - public Integer getOrderReasonId() { - return orderReasonId; - } - - public OrderExchangeDO setOrderReasonId(Integer orderReasonId) { - this.orderReasonId = orderReasonId; - return this; - } - - public String getReason() { - return reason; - } - - public OrderExchangeDO setReason(String reason) { - this.reason = reason; - return this; - } - - public Date getPaymentTime() { - return paymentTime; - } - - public OrderExchangeDO setPaymentTime(Date paymentTime) { - this.paymentTime = paymentTime; - return this; - } - - public Date getDeliveryTime() { - return deliveryTime; - } - - public OrderExchangeDO setDeliveryTime(Date deliveryTime) { - this.deliveryTime = deliveryTime; - return this; - } - - public Date getReceiverTime() { - return receiverTime; - } - - public OrderExchangeDO setReceiverTime(Date receiverTime) { - this.receiverTime = receiverTime; - return this; - } - - public Date getClosingTime() { - return closingTime; - } - - public OrderExchangeDO setClosingTime(Date closingTime) { - this.closingTime = closingTime; - return this; - } - - public Integer getOrderType() { - return orderType; - } - - public OrderExchangeDO setOrderType(Integer orderType) { - this.orderType = orderType; - return this; - } - - public Integer getStatus() { - return status; - } - - public OrderExchangeDO setStatus(Integer status) { - this.status = status; - return this; - } } diff --git a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderItemDO.java b/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderItemDO.java index 704ed67c..b7b3933c 100644 --- a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderItemDO.java +++ b/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderItemDO.java @@ -1,6 +1,8 @@ package cn.iocoder.mall.order.biz.dataobject; import cn.iocoder.common.framework.dataobject.DeletableDO; +import lombok.Data; +import lombok.experimental.Accessors; import java.util.Date; @@ -10,6 +12,8 @@ import java.util.Date; * @author Sin * @time 2019-03-16 14:03 */ +@Data +@Accessors(chain = true) public class OrderItemDO extends DeletableDO { /** @@ -105,179 +109,4 @@ public class OrderItemDO extends DeletableDO { */ private Integer status; - @Override - public String toString() { - return "OrderItemDO{" + - "id=" + id + - ", orderId=" + orderId + - ", orderNo='" + orderNo + '\'' + - ", skuId=" + skuId + - ", skuName='" + skuName + '\'' + - ", skuImage='" + skuImage + '\'' + - ", quantity=" + quantity + - ", price=" + price + - ", payAmount=" + payAmount + - ", orderLogisticsId=" + orderLogisticsId + - ", paymentTime=" + paymentTime + - ", deliveryTime=" + deliveryTime + - ", receiverTime=" + receiverTime + - ", closingTime=" + closingTime + - ", hasReturnExchange=" + hasReturnExchange + - ", deliveryType=" + deliveryType + - ", status=" + status + - '}'; - } - - public Integer getId() { - return id; - } - - public OrderItemDO setId(Integer id) { - this.id = id; - return this; - } - - public Integer getOrderId() { - return orderId; - } - - public OrderItemDO setOrderId(Integer orderId) { - this.orderId = orderId; - return this; - } - - public String getOrderNo() { - return orderNo; - } - - public OrderItemDO setOrderNo(String orderNo) { - this.orderNo = orderNo; - return this; - } - - public Integer getSkuId() { - return skuId; - } - - public OrderItemDO setSkuId(Integer skuId) { - this.skuId = skuId; - return this; - } - - public String getSkuName() { - return skuName; - } - - public OrderItemDO setSkuName(String skuName) { - this.skuName = skuName; - return this; - } - - public String getSkuImage() { - return skuImage; - } - - public OrderItemDO setSkuImage(String skuImage) { - this.skuImage = skuImage; - return this; - } - - public Integer getQuantity() { - return quantity; - } - - public OrderItemDO setQuantity(Integer quantity) { - this.quantity = quantity; - return this; - } - - public Integer getPrice() { - return price; - } - - public OrderItemDO setPrice(Integer price) { - this.price = price; - return this; - } - - public Integer getPayAmount() { - return payAmount; - } - - public OrderItemDO setPayAmount(Integer payAmount) { - this.payAmount = payAmount; - return this; - } - - public Integer getOrderLogisticsId() { - return orderLogisticsId; - } - - public OrderItemDO setOrderLogisticsId(Integer orderLogisticsId) { - this.orderLogisticsId = orderLogisticsId; - return this; - } - - public Date getPaymentTime() { - return paymentTime; - } - - public OrderItemDO setPaymentTime(Date paymentTime) { - this.paymentTime = paymentTime; - return this; - } - - public Date getDeliveryTime() { - return deliveryTime; - } - - public OrderItemDO setDeliveryTime(Date deliveryTime) { - this.deliveryTime = deliveryTime; - return this; - } - - public Date getReceiverTime() { - return receiverTime; - } - - public OrderItemDO setReceiverTime(Date receiverTime) { - this.receiverTime = receiverTime; - return this; - } - - public Date getClosingTime() { - return closingTime; - } - - public OrderItemDO setClosingTime(Date closingTime) { - this.closingTime = closingTime; - return this; - } - - public Integer getHasReturnExchange() { - return hasReturnExchange; - } - - public OrderItemDO setHasReturnExchange(Integer hasReturnExchange) { - this.hasReturnExchange = hasReturnExchange; - return this; - } - - public Integer getDeliveryType() { - return deliveryType; - } - - public OrderItemDO setDeliveryType(Integer deliveryType) { - this.deliveryType = deliveryType; - return this; - } - - public Integer getStatus() { - return status; - } - - public OrderItemDO setStatus(Integer status) { - this.status = status; - return this; - } } diff --git a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderLogisticsDO.java b/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderLogisticsDO.java index c7199d8d..c8693ebb 100644 --- a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderLogisticsDO.java +++ b/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderLogisticsDO.java @@ -1,6 +1,8 @@ package cn.iocoder.mall.order.biz.dataobject; import cn.iocoder.common.framework.dataobject.BaseDO; +import lombok.Data; +import lombok.experimental.Accessors; /** * 订单物流信息 @@ -8,6 +10,8 @@ import cn.iocoder.common.framework.dataobject.BaseDO; * @author Sin * @time 2019-03-19 20:47 */ +@Data +@Accessors(chain = true) public class OrderLogisticsDO extends BaseDO { /** @@ -43,89 +47,4 @@ public class OrderLogisticsDO extends BaseDO { */ private String logisticsNo; - @Override - public String toString() { - return "OrderLogisticsDO{" + - "id=" + id + - ", orderId=" + orderId + - ", areaNo='" + areaNo + '\'' + - ", name='" + name + '\'' + - ", mobile='" + mobile + '\'' + - ", address='" + address + '\'' + - ", logistics=" + logistics + - ", logisticsNo='" + logisticsNo + '\'' + - '}'; - } - - public Integer getId() { - return id; - } - - public OrderLogisticsDO setId(Integer id) { - this.id = id; - return this; - } - - public Integer getOrderId() { - return orderId; - } - - public OrderLogisticsDO setOrderId(Integer orderId) { - this.orderId = orderId; - return this; - } - - public String getAreaNo() { - return areaNo; - } - - public OrderLogisticsDO setAreaNo(String areaNo) { - this.areaNo = areaNo; - return this; - } - - public String getName() { - return name; - } - - public OrderLogisticsDO setName(String name) { - this.name = name; - return this; - } - - public String getMobile() { - return mobile; - } - - public OrderLogisticsDO setMobile(String mobile) { - this.mobile = mobile; - return this; - } - - public String getAddress() { - return address; - } - - public OrderLogisticsDO setAddress(String address) { - this.address = address; - return this; - } - - public Integer getLogistics() { - return logistics; - } - - public OrderLogisticsDO setLogistics(Integer logistics) { - this.logistics = logistics; - return this; - } - - public String getLogisticsNo() { - return logisticsNo; - } - - public OrderLogisticsDO setLogisticsNo(String logisticsNo) { - this.logisticsNo = logisticsNo; - return this; - } } diff --git a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderLogisticsDetailDO.java b/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderLogisticsDetailDO.java index 838ab122..51e83cd0 100644 --- a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderLogisticsDetailDO.java +++ b/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderLogisticsDetailDO.java @@ -1,6 +1,8 @@ package cn.iocoder.mall.order.biz.dataobject; import cn.iocoder.common.framework.dataobject.DeletableDO; +import lombok.Data; +import lombok.experimental.Accessors; import java.util.Date; @@ -12,6 +14,8 @@ import java.util.Date; * @author Sin * @time 2019-03-19 20:48 */ +@Data +@Accessors(chain = true) public class OrderLogisticsDetailDO extends DeletableDO { /** @@ -30,50 +34,4 @@ public class OrderLogisticsDetailDO extends DeletableDO { * 物流信息 */ private String logisticsInformation; - - @Override - public String toString() { - return "OrderLogisticsDetailDO{" + - "id=" + id + - ", orderLogisticsId=" + orderLogisticsId + - ", logisticsTime=" + logisticsTime + - ", logisticsInformation='" + logisticsInformation + '\'' + - '}'; - } - - public Integer getId() { - return id; - } - - public OrderLogisticsDetailDO setId(Integer id) { - this.id = id; - return this; - } - - public Integer getOrderLogisticsId() { - return orderLogisticsId; - } - - public OrderLogisticsDetailDO setOrderLogisticsId(Integer orderLogisticsId) { - this.orderLogisticsId = orderLogisticsId; - return this; - } - - public Date getLogisticsTime() { - return logisticsTime; - } - - public OrderLogisticsDetailDO setLogisticsTime(Date logisticsTime) { - this.logisticsTime = logisticsTime; - return this; - } - - public String getLogisticsInformation() { - return logisticsInformation; - } - - public OrderLogisticsDetailDO setLogisticsInformation(String logisticsInformation) { - this.logisticsInformation = logisticsInformation; - return this; - } } diff --git a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderRecipientDO.java b/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderRecipientDO.java index 4b1ff147..06946b89 100644 --- a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderRecipientDO.java +++ b/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderRecipientDO.java @@ -1,6 +1,8 @@ package cn.iocoder.mall.order.biz.dataobject; import cn.iocoder.common.framework.dataobject.BaseDO; +import lombok.Data; +import lombok.experimental.Accessors; /** * 订单收件人信息 order_recipient (配送信息) @@ -8,6 +10,8 @@ import cn.iocoder.common.framework.dataobject.BaseDO; * @author Sin * @time 2019-03-31 11:37 */ +@Data +@Accessors(chain = true) public class OrderRecipientDO extends BaseDO { /** @@ -41,79 +45,4 @@ public class OrderRecipientDO extends BaseDO { */ private String address; - @Override - public String toString() { - return "OrderRecipientDO{" + - "id=" + id + - ", orderId=" + orderId + - ", areaNo='" + areaNo + '\'' + - ", name='" + name + '\'' + - ", mobile='" + mobile + '\'' + - ", type=" + type + - ", address='" + address + '\'' + - '}'; - } - - public Integer getId() { - return id; - } - - public OrderRecipientDO setId(Integer id) { - this.id = id; - return this; - } - - public Integer getOrderId() { - return orderId; - } - - public OrderRecipientDO setOrderId(Integer orderId) { - this.orderId = orderId; - return this; - } - - public String getAreaNo() { - return areaNo; - } - - public OrderRecipientDO setAreaNo(String areaNo) { - this.areaNo = areaNo; - return this; - } - - public String getName() { - return name; - } - - public OrderRecipientDO setName(String name) { - this.name = name; - return this; - } - - public String getMobile() { - return mobile; - } - - public OrderRecipientDO setMobile(String mobile) { - this.mobile = mobile; - return this; - } - - public Integer getType() { - return type; - } - - public OrderRecipientDO setType(Integer type) { - this.type = type; - return this; - } - - public String getAddress() { - return address; - } - - public OrderRecipientDO setAddress(String address) { - this.address = address; - return this; - } } diff --git a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderReturnDO.java b/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderReturnDO.java index 20fa6dab..16c500f2 100644 --- a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderReturnDO.java +++ b/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderReturnDO.java @@ -1,6 +1,8 @@ package cn.iocoder.mall.order.biz.dataobject; import cn.iocoder.common.framework.dataobject.DeletableDO; +import lombok.Data; +import lombok.experimental.Accessors; import java.util.Date; @@ -10,6 +12,8 @@ import java.util.Date; * @author Sin * @time 2019-03-19 19:48 */ +@Data +@Accessors(chain = true) public class OrderReturnDO extends DeletableDO { /** @@ -106,181 +110,4 @@ public class OrderReturnDO extends DeletableDO { */ private Integer status; - @Override - public String toString() { - return "OrderReturnDO{" + - "id=" + id + - ", orderId=" + orderId + - ", orderNo='" + orderNo + '\'' + - ", orderItemId=" + orderItemId + - ", skuId=" + skuId + - ", skuName='" + skuName + '\'' + - ", skuImage='" + skuImage + '\'' + - ", orderLogisticsId=" + orderLogisticsId + - ", orderReason=" + orderReason + - ", otherReasons='" + otherReasons + '\'' + - ", createTime=" + createTime + - ", approvalTime=" + approvalTime + - ", logisticsTime=" + logisticsTime + - ", receiverTime=" + receiverTime + - ", closingTime=" + closingTime + - ", orderType=" + orderType + - ", status=" + status + - '}'; - } - - public Integer getId() { - return id; - } - - public OrderReturnDO setId(Integer id) { - this.id = id; - return this; - } - - public Integer getOrderId() { - return orderId; - } - - public OrderReturnDO setOrderId(Integer orderId) { - this.orderId = orderId; - return this; - } - - public String getOrderNo() { - return orderNo; - } - - public OrderReturnDO setOrderNo(String orderNo) { - this.orderNo = orderNo; - return this; - } - - public Integer getOrderItemId() { - return orderItemId; - } - - public OrderReturnDO setOrderItemId(Integer orderItemId) { - this.orderItemId = orderItemId; - return this; - } - - public Integer getSkuId() { - return skuId; - } - - public OrderReturnDO setSkuId(Integer skuId) { - this.skuId = skuId; - return this; - } - - public String getSkuName() { - return skuName; - } - - public OrderReturnDO setSkuName(String skuName) { - this.skuName = skuName; - return this; - } - - public String getSkuImage() { - return skuImage; - } - - public OrderReturnDO setSkuImage(String skuImage) { - this.skuImage = skuImage; - return this; - } - - public Integer getOrderLogisticsId() { - return orderLogisticsId; - } - - public OrderReturnDO setOrderLogisticsId(Integer orderLogisticsId) { - this.orderLogisticsId = orderLogisticsId; - return this; - } - - public Integer getOrderReason() { - return orderReason; - } - - public OrderReturnDO setOrderReason(Integer orderReason) { - this.orderReason = orderReason; - return this; - } - - public String getOtherReasons() { - return otherReasons; - } - - public OrderReturnDO setOtherReasons(String otherReasons) { - this.otherReasons = otherReasons; - return this; - } - - @Override - public Date getCreateTime() { - return createTime; - } - - @Override - public OrderReturnDO setCreateTime(Date createTime) { - this.createTime = createTime; - return this; - } - - public Date getApprovalTime() { - return approvalTime; - } - - public OrderReturnDO setApprovalTime(Date approvalTime) { - this.approvalTime = approvalTime; - return this; - } - - public Date getLogisticsTime() { - return logisticsTime; - } - - public OrderReturnDO setLogisticsTime(Date logisticsTime) { - this.logisticsTime = logisticsTime; - return this; - } - - public Date getReceiverTime() { - return receiverTime; - } - - public OrderReturnDO setReceiverTime(Date receiverTime) { - this.receiverTime = receiverTime; - return this; - } - - public Date getClosingTime() { - return closingTime; - } - - public OrderReturnDO setClosingTime(Date closingTime) { - this.closingTime = closingTime; - return this; - } - - public Integer getOrderType() { - return orderType; - } - - public OrderReturnDO setOrderType(Integer orderType) { - this.orderType = orderType; - return this; - } - - public Integer getStatus() { - return status; - } - - public OrderReturnDO setStatus(Integer status) { - this.status = status; - return this; - } }