oneos-v5/backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- 优化订单查询，和 convert 转换

Browse Source
This commit is contained in:
sin
2019-03-24 16:58:24 +08:00
parent 6cc00a373b
commit e9b5adeac3
26 changed files with 211 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
order/order-service-api/src/main/java/cn/iocoder/mall/order/api/OrderService.java
View File

@@ -56,7 +56,7 @@ public interface OrderService {
* - 联系人电话
* - 联系人姓名
*/
CommonResult updateLogistics(OrderLogisticsDTO orderLogisticsDTO);
CommonResult updateLogistics(OrderLogisticsUpdateDTO orderLogisticsDTO);
/**
* 删除订单

4
order/order-service-api/src/main/java/cn/iocoder/mall/order/api/constant/OrderErrorCodeEnum.java
View File

@@ -10,7 +10,9 @@ package cn.iocoder.mall.order.api.constant;
*/
public enum OrderErrorCodeEnum {
ORDER_ITEM_ONLY_ONE(1000001000, "订单Item只有一个"),
ORDER_ITEM_ONLY_ONE(1000001000, "订单Item只有一个!"),
ORDER_GET_SKU_FAIL(1000001001, "获取商品失败!"),
ORDER_GET_SKU_NOT_EXISTENT(1000001002, "获取的商品不存在!"),
;
private final int code;

4
order/order-service-api/src/main/java/cn/iocoder/mall/order/api/constant/OrderHasReturnExchangeEnum.java
View File

@@ -10,8 +10,8 @@ public enum OrderHasReturnExchangeEnum {
NO(1, "没有"),
RETURN_GOODS(2, "退货"),
EXCHANGE_GOODS(2, "换货"),
RETURN_EXCHANGE_GOODS(2, "退换货");
EXCHANGE_GOODS(3, "换货"),
RETURN_EXCHANGE_GOODS(4, "退换货");
/**
* 状态值

15
order/order-service-api/src/main/java/cn/iocoder/mall/order/api/dto/OrderLogisticsDTO.java → order/order-service-api/src/main/java/cn/iocoder/mall/order/api/dto/OrderLogisticsUpdateDTO.java
View File

@@ -10,7 +10,7 @@ import java.io.Serializable;
* @author Sin
* @time 2019-03-17 20:22
*/
public class OrderLogisticsDTO implements Serializable {
public class OrderLogisticsUpdateDTO implements Serializable {
/**
* 订单 id
@@ -42,7 +42,6 @@ public class OrderLogisticsDTO implements Serializable {
/**
* 物流编号
*/
@NotNull
private String logisticsNo;
@Override
@@ -61,7 +60,7 @@ public class OrderLogisticsDTO implements Serializable {
return id;
}
public OrderLogisticsDTO setId(Integer id) {
public OrderLogisticsUpdateDTO setId(Integer id) {
this.id = id;
return this;
}
@@ -70,7 +69,7 @@ public class OrderLogisticsDTO implements Serializable {
return areaNo;
}
public OrderLogisticsDTO setAreaNo(String areaNo) {
public OrderLogisticsUpdateDTO setAreaNo(String areaNo) {
this.areaNo = areaNo;
return this;
}
@@ -79,7 +78,7 @@ public class OrderLogisticsDTO implements Serializable {
return name;
}
public OrderLogisticsDTO setName(String name) {
public OrderLogisticsUpdateDTO setName(String name) {
this.name = name;
return this;
}
@@ -88,7 +87,7 @@ public class OrderLogisticsDTO implements Serializable {
return mobile;
}
public OrderLogisticsDTO setMobile(String mobile) {
public OrderLogisticsUpdateDTO setMobile(String mobile) {
this.mobile = mobile;
return this;
}
@@ -97,7 +96,7 @@ public class OrderLogisticsDTO implements Serializable {
return address;
}
public OrderLogisticsDTO setAddress(String address) {
public OrderLogisticsUpdateDTO setAddress(String address) {
this.address = address;
return this;
}
@@ -106,7 +105,7 @@ public class OrderLogisticsDTO implements Serializable {
return logisticsNo;
}
public OrderLogisticsDTO setLogisticsNo(String logisticsNo) {
public OrderLogisticsUpdateDTO setLogisticsNo(String logisticsNo) {
this.logisticsNo = logisticsNo;
return this;
}

55
order/order-service-api/src/main/java/cn/iocoder/mall/order/api/dto/OrderPageBO.java
View File

@@ -10,6 +10,7 @@ import java.util.Date;
* @time 2019-03-23 14:30
*/
public class OrderPageBO implements Serializable {
/**
* id
*/
@@ -29,7 +30,7 @@ public class OrderPageBO implements Serializable {
/**
* 交易金额
*/
private Integer money;
private Integer price;
///
/// 时间信息
@@ -77,18 +78,6 @@ public class OrderPageBO implements Serializable {
* 备注
*/
private String remark;
/**
* 创建时间
*/
private Date createTime;
/**
* 更新时间
*/
private Date updateTime;
/**
* 删除
*/
private Integer deleted;
@Override
public String toString() {
@@ -97,7 +86,7 @@ public class OrderPageBO implements Serializable {
", userId=" + userId +
", orderLogisticsId=" + orderLogisticsId +
", orderNo='" + orderNo + '\'' +
", money=" + money +
", price=" + price +
", paymentTime=" + paymentTime +
", deliveryTime=" + deliveryTime +
", receiverTime=" + receiverTime +
@@ -105,9 +94,6 @@ public class OrderPageBO implements Serializable {
", hasReturnExchange=" + hasReturnExchange +
", status=" + status +
", remark='" + remark + '\'' +
", createTime=" + createTime +
", updateTime=" + updateTime +
", deleted=" + deleted +
'}';
}
@@ -147,12 +133,12 @@ public class OrderPageBO implements Serializable {
return this;
}
public Integer getMoney() {
return money;
public Integer getPrice() {
return price;
}
public OrderPageBO setMoney(Integer money) {
this.money = money;
public OrderPageBO setPrice(Integer price) {
this.price = price;
return this;
}
@@ -218,31 +204,4 @@ public class OrderPageBO implements Serializable {
this.remark = remark;
return this;
}
public Date getCreateTime() {
return createTime;
}
public OrderPageBO setCreateTime(Date createTime) {
this.createTime = createTime;
return this;
}
public Date getUpdateTime() {
return updateTime;
}
public OrderPageBO setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
return this;
}
public Integer getDeleted() {
return deleted;
}
public OrderPageBO setDeleted(Integer deleted) {
this.deleted = deleted;
return this;
}
}

45
order/order-service-api/src/main/java/cn/iocoder/mall/order/api/dto/OrderQueryDTO.java
View File

@@ -24,6 +24,14 @@ public class OrderQueryDTO implements Serializable {
* 用户 id
*/
private Integer userId;
/**
* 物流id
*/
private Integer orderLogisticsId;
/**
* 是否退换货
*/
private Integer hasReturnExchange;
/**
* 付款时间（待发货）
*/
@@ -38,10 +46,11 @@ public class OrderQueryDTO implements Serializable {
* 删除状态
*/
private Integer deleted;
@NotNull(message = "页码不能为空")
/**
* 状态
*/
private Integer status;
private Integer pageNo;
@NotNull(message = "每页条数不能为空")
private Integer pageSize;
@Override
@@ -50,11 +59,14 @@ public class OrderQueryDTO implements Serializable {
"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 +
'}';
@@ -87,6 +99,24 @@ public class OrderQueryDTO implements Serializable {
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;
}
@@ -132,6 +162,15 @@ public class OrderQueryDTO implements Serializable {
return this;
}
public Integer getStatus() {
return status;
}
public OrderQueryDTO setStatus(Integer status) {
this.status = status;
return this;
}
public Integer getPageNo() {
return pageNo;
}