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-30 21:31:06 +08:00
parent bbccd623e4
commit 0256a4da17
44 changed files with 715 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
order/order-service-api/src/main/java/cn/iocoder/mall/order/api/OrderReturnService.java Normal file
View File

@@ -0,0 +1,21 @@
package cn.iocoder.mall.order.api;
import cn.iocoder.common.framework.vo.CommonResult;
import cn.iocoder.mall.order.api.dto.OrderReturnCreateDTO;
/**
* 订单退货
*
* @author Sin
* @time 2019-03-30 15:33
*/
public interface OrderReturnService {
/**
* 订单退货 - 创建
*
* @param orderReturnCreate
* @return
*/
CommonResult createOrderReturn(OrderReturnCreateDTO orderReturnCreate);
}

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

@@ -39,7 +39,7 @@ public interface OrderService {
CommonResult updateOrderItem(OrderItemUpdateDTO orderItemUpdateDTO);
/**
* 订单item - 更新 payAmount(实付金额)
* 更新订单item - payAmount(实付金额)
*
* @param orderId
* @param orderItemId
@@ -49,7 +49,24 @@ public interface OrderService {
CommonResult updateOrderItemPayAmount(Integer orderId, Integer orderItemId, Integer payAmount);
/**
* 订单item - 删除
* 订单 - 取消订单
*
* @param orderId
* @return
*/
CommonResult cancelOrder(Integer orderId, Integer reasons, String otherReasons);
/**
* 更新订单 - 备注
*
* @param orderId
* @param remake
* @return
*/
CommonResult updateOrderRemake(Integer orderId, String remake);
/**
* 删除订单item
*
* @param orderItemDeletedDTO
* @return

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

@@ -5,13 +5,13 @@ import cn.iocoder.common.framework.constant.ModuleErrorCodeInterval;
/**
* 错误码区间
*
* 当前模块化区间：[1-000-001-000 ~ 1-000-002-000]
* 当前模块化区间：[1-008-000-000 ~ 1-008-000-000]
*
* @author Sin
* @time 2019-03-23 11:35
*/
public class ErrorCodeInterval extends ModuleErrorCodeInterval {
// OrderErrorCodeEnum 错误码区间 [1-000-001-000 ~ 1-000-001-100]
// OrderErrorCodeEnum 错误码区间 [1-008-000-000 ~ 1-008-000-000]
}

54
order/order-service-api/src/main/java/cn/iocoder/mall/order/api/constant/OrderCancelReasonsEnum.java Normal file
View File

@@ -0,0 +1,54 @@
package cn.iocoder.mall.order.api.constant;
/**
* 订单取消原因
* order_cancel_reasons
* @author Sin
* @time 2019-03-30 15:08
*/
public enum OrderCancelReasonsEnum {
CANCEL_1(1, "无法联系上买家"),
CANCEL_2(2, "买家误拍或重拍了"),
CANCEL_3(3, "买家无诚意完成交易"),
CANCEL_4(4, "已通过银行线下汇款"),
CANCEL_5(5, "已通过同城见面交易"),
CANCEL_6(6, "已通过货到付款交易"),
CANCEL_7(7, "已通过网上银行直接汇款"),
CANCEL_8(8, "已经缺货无法交易"),
CANCEL_20(20, "其他"),
;
// 无法联系上买家
// 买家误拍或重拍了
// 买家无诚意完成交易
// 已通过银行线下汇款
// 已通过同城见面交易
// 已通过货到付款交易
// 已通过网上银行直接汇款
// 已经缺货无法交易
private final int code;
private final String message;
OrderCancelReasonsEnum(int code, String message) {
this.code = code;
this.message = message;
}
@Override
public String toString() {
return "OrderCancelEnum{" +
"code=" + code +
", message='" + message + '\'' +
'}';
}
public int getCode() {
return code;
}
public String getMessage() {
return message;
}
}

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

@@ -3,17 +3,22 @@ package cn.iocoder.mall.order.api.constant;
/**
* 订单错误码
*
* 错误码区间 [1-000-001-000 ~ 1-000-002-000]
* 错误码区间 [1-008-000-000 ~ 1-008-000-000]
*
* @author Sin
* @time 2019-03-23 11:23
*/
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, "支付金额不能为负数!"),
// order
ORDER_NOT_EXISTENT(1008000000, "获取订单不存在!"),
ORDER_GET_SKU_FAIL(1008000001, "获取商品失败!"),
ORDER_GET_SKU_NOT_EXISTENT(1008000002, "获取的商品不存在!"),
ORDER_PAY_AMOUNT_NOT_NEGATIVE(1008000003, "支付金额不能为负数!"),
ORDER_STATUS_NOT_CANCEL(1008000004, "订单状态不能取消"),
// order item
ORDER_ITEM_ONLY_ONE(1008000004, "订单Item只有一个!"),
;
private final int code;

41
order/order-service-api/src/main/java/cn/iocoder/mall/order/api/constant/OrderReturnStatusEnum.java Normal file
View File

@@ -0,0 +1,41 @@
package cn.iocoder.mall.order.api.constant;
/**
* 订单退货 status
*
* @author Sin
* @time 2019-03-30 15:56
*/
public enum OrderReturnStatusEnum {
/**
* 状态
*
* - 1、退货申请
* - 2、申请成功
* - 3、申请失败
* - 4、退货中
* - 5、退货成功
*/
RETURN_APPLICATION(1, "退货申请"),
APPLICATION_SUCCESSFUL(1, "申请成功"),
APPLICATION_FAIL(1, "申请失败"),
;
private final int value;
private final String name;
OrderReturnStatusEnum(int value, String name) {
this.value = value;
this.name = name;
}
public int getValue() {
return value;
}
public String getName() {
return name;
}
}

31
order/order-service-api/src/main/java/cn/iocoder/mall/order/api/constant/OrderReturnTypeEnum.java Normal file
View File

@@ -0,0 +1,31 @@
package cn.iocoder.mall.order.api.constant;
/**
* 订单退货 类型
*
* @author Sin
* @time 2019-03-30 15:42
*/
public enum OrderReturnTypeEnum {
ORDER(1, "订单"),
ORDER_ITEM(2, "订单item"),
;
private final int value;
private final String name;
OrderReturnTypeEnum(int value, String name) {
this.value = value;
this.name = name;
}
public int getValue() {
return value;
}
public String getName() {
return name;
}
}

93
order/order-service-api/src/main/java/cn/iocoder/mall/order/api/dto/OrderReturnCreateDTO.java Normal file
View File

@@ -0,0 +1,93 @@
package cn.iocoder.mall.order.api.dto;
import java.io.Serializable;
import java.util.Date;
/**
* 订单退货 - 创建
*
* @author Sin
* @time 2019-03-30 15:34
*/
public class OrderReturnCreateDTO implements Serializable {
/**
* 订单编号
*/
private Integer orderId;
/**
* 订单 item 编号
*/
private Integer orderItemId;
/**
* 退货原因(字典值)
*/
private Integer orderReason;
/**
* 原因（如果选择其他，原因保存在这）
*/
private String otherReasons;
/**
* 订单类型
*
* - 0、为 Order 订单 （对整个订单退货）
* - 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;
}
}