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

- 修改订单展示

Browse Source 
- 增加实付金额修改功能
This commit is contained in:
sin
2019-03-29 17:14:53 +08:00
parent 3cbe0ba3b6
commit 0d14138ef2
27 changed files with 665 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,10 +1,10 @@
package cn.iocoder.mall.order.api;
import cn.iocoder.common.framework.vo.CommonResult;
import cn.iocoder.mall.order.api.bo.OrderCreateBO;
import cn.iocoder.mall.order.api.bo.OrderPageBO;
import cn.iocoder.mall.order.api.dto.*;
import java.util.List;
/**
* 订单 service
*
@@ -28,7 +28,7 @@ public interface OrderService {
* @param orderCreateDTO
* @return
*/
CommonResult<cn.iocoder.mall.order.api.bo.OrderBO> createOrder(Integer userId, OrderCreateDTO orderCreateDTO);
CommonResult<OrderCreateBO> createOrder(Integer userId, OrderCreateDTO orderCreateDTO);
/**
* 订单item - 更新
@@ -38,6 +38,16 @@ public interface OrderService {
*/
CommonResult updateOrderItem(OrderItemUpdateDTO orderItemUpdateDTO);
/**
* 订单item - 更新 payAmount(实付金额)
*
* @param orderId
* @param orderItemId
* @param payAmount
* @return
*/
CommonResult updateOrderItemPayAmount(Integer orderId, Integer orderItemId, Integer payAmount);
/**
* 订单item - 删除
*

199
order/order-service-api/src/main/java/cn/iocoder/mall/order/api/bo/OrderBO.java
View File

@@ -1,34 +1,114 @@
package cn.iocoder.mall.order.api.bo;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
* 订单创建 BO
* 订单 page
*
* @author Sin
* @time 2019-03-16 14:38
* @time 2019-03-23 14:30
*/
public class OrderBO implements Serializable {
/**
* 编号
* id
*/
private Integer id;
/**
* 用户编号
*/
private Integer userId;
/**
* 物流id
*/
private Integer orderLogisticsId;
/**
* 订单编号
*/
private String orderNo;
/**
* 订单金额
* 交易金额
*/
private Integer money;
private Integer payAmount;
///
/// 时间信息
/**
* 付款时间（待发货）
*/
private Date paymentTime;
/**
* 发货时间（待收货）
*/
private Date deliveryTime;
/**
* 收货时间（已签收）
*/
private Date receiverTime;
/**
* 成交时间（用户确认收货 -> status = 已完成）
*/
private Date closingTime;
///
/// 其他
/**
* 是否退货
*
* - 0、没有
* - 1、换货
* - 2、退货
* - 3、换货 + 退货
*/
private Integer hasReturnExchange;
/**
* 状态(如果有多个商品分开发货需要全部商品发完才会改变状态)
*
* - 0、待付款
* - 1、待发货
* - 2、待收获
* - 3、已完成
* - 4、已关闭
*/
private Integer status;
/**
* 备注
*/
private String remark;
///
/// 关联信息
/**
* orderItem
*/
private List<OrderItemBO> orderItems;
/**
* 订单物流信息
*/
private OrderLogisticsBO orderLogistics;
@Override
public String toString() {
return "OrderBO{" +
"id=" + id +
", userId=" + userId +
", orderLogisticsId=" + orderLogisticsId +
", orderNo='" + orderNo + '\'' +
", money=" + money +
", payAmount=" + payAmount +
", paymentTime=" + paymentTime +
", deliveryTime=" + deliveryTime +
", receiverTime=" + receiverTime +
", closingTime=" + closingTime +
", hasReturnExchange=" + hasReturnExchange +
", status=" + status +
", remark='" + remark + '\'' +
", orderItems=" + orderItems +
", orderLogistics=" + orderLogistics +
'}';
}
@@ -41,6 +121,24 @@ public class OrderBO implements Serializable {
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;
}
@@ -50,12 +148,93 @@ public class OrderBO implements Serializable {
return this;
}
public Integer getMoney() {
return money;
public Integer getPayAmount() {
return payAmount;
}
public OrderBO setMoney(Integer money) {
this.money = money;
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<OrderItemBO> getOrderItems() {
return orderItems;
}
public OrderBO setOrderItems(List<OrderItemBO> orderItems) {
this.orderItems = orderItems;
return this;
}
public OrderLogisticsBO getOrderLogistics() {
return orderLogistics;
}
public OrderBO setOrderLogistics(OrderLogisticsBO orderLogistics) {
this.orderLogistics = orderLogistics;
return this;
}
}

61
order/order-service-api/src/main/java/cn/iocoder/mall/order/api/bo/OrderCreateBO.java Normal file
View File

@@ -0,0 +1,61 @@
package cn.iocoder.mall.order.api.bo;
import java.io.Serializable;
/**
* 订单创建 BO
*
* @author Sin
* @time 2019-03-16 14:38
*/
public class OrderCreateBO implements Serializable {
/**
* 编号
*/
private Integer id;
/**
* 订单编号
*/
private String orderNo;
/**
* 订单金额
*/
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;
}
}

93
order/order-service-api/src/main/java/cn/iocoder/mall/order/api/dto/OrderItemBO.java → order/order-service-api/src/main/java/cn/iocoder/mall/order/api/bo/OrderItemBO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.mall.order.api.dto;
package cn.iocoder.mall.order.api.bo;
import java.io.Serializable;
import java.util.Date;
@@ -27,14 +27,26 @@ public class OrderItemBO implements Serializable {
* 商品编号
*/
private Integer skuId;
/**
* 商品名称
*/
private String skuName;
/**
* 商品图片
*/
private String skuImage;
/**
* 数量
*/
private Integer quantity;
/**
* 金额(分)
* 价格(分)
*/
private Integer price;
/**
* 支付金额（实付金额）
*/
private Integer payAmount;
///
/// 时间信息
@@ -79,21 +91,40 @@ public class OrderItemBO implements Serializable {
*/
private Integer status;
/**
* 创建时间
*/
private Date createTime;
/**
* 更新时间
*/
private Date updateTime;
/**
* 删除状态
*/
private Integer deleted;
@Override
public String toString() {
return "OrderItemDO{" +
return "OrderItemBO{" +
"id=" + id +
", orderId=" + orderId +
", orderNo='" + orderNo + '\'' +
", skuId='" + skuId + '\'' +
", skuId=" + skuId +
", skuName='" + skuName + '\'' +
", skuImage='" + skuImage + '\'' +
", quantity=" + quantity +
", price=" + price +
", payAmount=" + payAmount +
", paymentTime=" + paymentTime +
", deliveryTime=" + deliveryTime +
", receiverTime=" + receiverTime +
", closingTime=" + closingTime +
", hasReturnExchange=" + hasReturnExchange +
", status=" + status +
", createTime=" + createTime +
", updateTime=" + updateTime +
", deleted=" + deleted +
'}';
}
@@ -133,6 +164,24 @@ public class OrderItemBO implements Serializable {
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;
}
@@ -151,6 +200,15 @@ public class OrderItemBO implements Serializable {
return this;
}
public Integer getPayAmount() {
return payAmount;
}
public OrderItemBO setPayAmount(Integer payAmount) {
this.payAmount = payAmount;
return this;
}
public Date getPaymentTime() {
return paymentTime;
}
@@ -204,4 +262,31 @@ public class OrderItemBO implements Serializable {
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;
}
}

103
order/order-service-api/src/main/java/cn/iocoder/mall/order/api/bo/OrderLogisticsBO.java Normal file
View File

@@ -0,0 +1,103 @@
package cn.iocoder.mall.order.api.bo;
import cn.iocoder.common.framework.dataobject.BaseDO;
/**
* 订单物流信息
*
* @author Sin
* @time 2019-03-19 20:47
*/
public class OrderLogisticsBO extends BaseDO {
/**
* id
*/
private Integer id;
/**
* 收件区域编号
*/
private String areaNo;
/**
* 收件人名称
*/
private String name;
/**
* 收件手机号
*/
private String mobile;
/**
* 收件详细地址
*/
private String address;
/**
* 物流编号
*/
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;
}
}

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

@@ -1,4 +1,4 @@
package cn.iocoder.mall.order.api.dto;
package cn.iocoder.mall.order.api.bo;
import java.io.Serializable;
import java.util.List;

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

@@ -13,6 +13,7 @@ public enum OrderErrorCodeEnum {
ORDER_ITEM_ONLY_ONE(1000001000, "订单Item只有一个!"),
ORDER_GET_SKU_FAIL(1000001001, "获取商品失败!"),
ORDER_GET_SKU_NOT_EXISTENT(1000001002, "获取的商品不存在!"),
ORDER_PAY_AMOUNT_NOT_NEGATIVE(1000001002, "支付金额不能为负数!"),
;
private final int code;

226
order/order-service-api/src/main/java/cn/iocoder/mall/order/api/dto/OrderBO.java
View File

@@ -1,226 +0,0 @@
package cn.iocoder.mall.order.api.dto;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
* 订单 page
*
* @author Sin
* @time 2019-03-23 14:30
*/
public class OrderBO implements Serializable {
/**
* id
*/
private Integer id;
/**
* 用户编号
*/
private Integer userId;
/**
* 物流id
*/
private Integer orderLogisticsId;
/**
* 订单编号
*/
private String orderNo;
/**
* 交易金额
*/
private Integer price;
///
/// 时间信息
/**
* 付款时间（待发货）
*/
private Date paymentTime;
/**
* 发货时间（待收货）
*/
private Date deliveryTime;
/**
* 收货时间（已签收）
*/
private Date receiverTime;
/**
* 成交时间（用户确认收货 -> status = 已完成）
*/
private Date closingTime;
///
/// 其他
/**
* 是否退货
*
* - 0、没有
* - 1、换货
* - 2、退货
* - 3、换货 + 退货
*/
private Integer hasReturnExchange;
/**
* 状态(如果有多个商品分开发货需要全部商品发完才会改变状态)
*
* - 0、待付款
* - 1、待发货
* - 2、待收获
* - 3、已完成
* - 4、已关闭
*/
private Integer status;
/**
* 备注
*/
private String remark;
///
/// 关联信息
/**
* orderItem
*/
private List<OrderItemBO> orderItems;
@Override
public String toString() {
return "OrderBO{" +
"id=" + id +
", userId=" + userId +
", orderLogisticsId=" + orderLogisticsId +
", orderNo='" + orderNo + '\'' +
", price=" + price +
", paymentTime=" + paymentTime +
", deliveryTime=" + deliveryTime +
", receiverTime=" + receiverTime +
", closingTime=" + closingTime +
", hasReturnExchange=" + hasReturnExchange +
", status=" + status +
", remark='" + remark + '\'' +
", orderItems=" + orderItems +
'}';
}
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 getPrice() {
return price;
}
public OrderBO setPrice(Integer price) {
this.price = price;
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<OrderItemBO> getOrderItems() {
return orderItems;
}
public OrderBO setOrderItems(List<OrderItemBO> orderItems) {
this.orderItems = orderItems;
return this;
}
}