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-04-27 16:31:49 +08:00
parent 6e92e7162c
commit 6e91c41cca
17 changed files with 220 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
order/order-service-api/src/main/java/cn/iocoder/mall/order/api/OrderLogisticsService.java
View File

@@ -1,10 +1,9 @@
package cn.iocoder.mall.order.api;
import cn.iocoder.common.framework.vo.CommonResult;
import cn.iocoder.mall.order.api.bo.OrderLogisticsBO;
import cn.iocoder.mall.order.api.bo.OrderLastLogisticsInfoBO;
import cn.iocoder.mall.order.api.bo.OrderLogisticsInfoBO;
import java.util.List;
import cn.iocoder.mall.order.api.bo.OrderLogisticsInfoWithOrderBO;
/**
* 订单物流信息
@@ -14,13 +13,31 @@ import java.util.List;
*/
public interface OrderLogisticsService {
/**
* 物流信息
* 获取物流信息 - 根据id
*
* @param id
* @return
*/
CommonResult<OrderLogisticsInfoBO> getLogisticsInfo(Integer id);
/**
* 获取 last 物流信息 - 根据id
*
* @param id
* @return
*/
CommonResult<OrderLastLogisticsInfoBO> getLastLogisticsInfo(Integer id);
/**
* 获取物流信息 - 根据 orderId
*
* @param userId
* @param orderId
* @return
*/
CommonResult<OrderLogisticsInfoBO> logisticsInfo(Integer userId, Integer orderId);
CommonResult<OrderLogisticsInfoWithOrderBO> getOrderLogisticsInfo(Integer userId, Integer orderId);
}

3
order/order-service-api/src/main/java/cn/iocoder/mall/order/api/OrderReturnService.java
View File

@@ -1,6 +1,7 @@
package cn.iocoder.mall.order.api;
import cn.iocoder.common.framework.vo.CommonResult;
import cn.iocoder.mall.order.api.bo.OrderReturnInfoBO;
import cn.iocoder.mall.order.api.dto.OrderReturnApplyDTO;
/**
@@ -38,5 +39,5 @@ public interface OrderReturnService {
* @param orderId
* @return
*/
CommonResult orderApplyInfo(Integer orderId);
CommonResult<OrderReturnInfoBO> orderApplyInfo(Integer orderId);
}

76
order/order-service-api/src/main/java/cn/iocoder/mall/order/api/bo/OrderLogisticsInfoBO.java
View File

@@ -18,60 +18,42 @@ import java.util.List;
public class OrderLogisticsInfoBO implements Serializable {
/**
* 订单id
* id
*/
private Integer orderId;
private Integer id;
/**
* 订单编号
* 收件区域编号
*/
private String orderNo;
private String areaNo;
/**
* 物流信息
* 收件人名称
*/
private List<Logistics> logistics;
private String name;
/**
* 收件手机号
*/
private String mobile;
/**
* 收件详细地址
*/
private String address;
/**
* 物流 (字典)
*/
private Integer logistics;
/**
* 物流 (字典) 转换后的值
*/
private String logisticsText;
/**
* 物流编号
*/
private String logisticsNo;
@Data
@Accessors(chain = true)
public static class Logistics {
///
/// 物流信息
/**
* id
*/
private Integer id;
/**
* 收件区域编号
*/
private String areaNo;
/**
* 收件人名称
*/
private String name;
/**
* 收件手机号
*/
private String mobile;
/**
* 收件详细地址
*/
private String address;
/**
* 物流 (字典)
*/
private Integer logistics;
/**
* 物流 (字典) 转换后的值
*/
private String logisticsText;
/**
* 物流编号
*/
private String logisticsNo;
///
/// 物流信息
private List<LogisticsDetail> details;
}
private List<LogisticsDetail> details;
@Data
@Accessors(chain = true)

8
order/order-service-api/src/main/java/cn/iocoder/mall/order/api/bo/OrderReturnInfoBO.java
View File

@@ -25,6 +25,10 @@ public class OrderReturnInfoBO implements Serializable {
* 订单 item
*/
private List<OrderItem> orderItems;
/**
* 最后一个物流信息/最新物流信息
*/
private OrderLastLogisticsInfoBO lastLogisticsInfo;
@Data
@Accessors(chain = true)
@@ -80,6 +84,10 @@ public class OrderReturnInfoBO implements Serializable {
///
/// 退货原因
/**
* 退货金额
*/
private Integer refundPrice;
/**
* 退货原因(字典值)
*/

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

@@ -42,6 +42,7 @@ public enum OrderErrorCodeEnum {
// 工具类服务 1008004000
DICT_SERVER_INVOKING_FAIL(1008004000, "字典服务调用失败!"),
ORDER_LOGISTICS_INVOKING_FAIL(1008004001, "订单物流调用失败!"),
;