trade：增加用户 App 的订单分页和详情接口
YunaiV
3 years ago
parent
b7d78a24a4
commit
7f131a3853
@ -0,0 +1,150 @@
|
||||
package cn.iocoder.yudao.module.trade.controller.app.order.vo;
|
||||
|
||||
import cn.iocoder.yudao.module.trade.controller.app.base.property.AppProductPropertyValueDetailRespVO;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
@ApiModel("用户 App - 订单交易的明细 Response VO")
|
||||
@Data
|
||||
public class AppTradeOrderDetailRespVO {
|
||||
|
||||
// ========== 订单基本信息 ==========
|
||||
|
||||
@ApiModelProperty(value = "订单编号", required = true, example = "1024")
|
||||
private Long id;
|
||||
|
||||
@ApiModelProperty(value = "订单流水号", required = true, example = "1146347329394184195")
|
||||
private String no;
|
||||
|
||||
@ApiModelProperty(value = "创建时间", required = true, notes = "下单时间")
|
||||
private Date createTime;
|
||||
|
||||
@ApiModelProperty(value = "用户备注", required = true, example = "你猜")
|
||||
private String userRemark;
|
||||
|
||||
@ApiModelProperty(value = "订单状态", required = true, example = "1", notes = "参见 TradeOrderStatusEnum 枚举")
|
||||
private Integer status;
|
||||
|
||||
@ApiModelProperty(value = "购买的商品数量", required = true, example = "10")
|
||||
private Integer productCount;
|
||||
|
||||
@ApiModelProperty(value = "订单完成时间")
|
||||
private LocalDateTime finishTime;
|
||||
|
||||
@ApiModelProperty(value = "订单取消时间")
|
||||
private LocalDateTime cancelTime;
|
||||
|
||||
// ========== 价格 + 支付基本信息 ==========
|
||||
|
||||
@ApiModelProperty(value = "支付订单编号", required = true, example = "1024")
|
||||
private Long payOrderId;
|
||||
|
||||
@ApiModelProperty(value = "付款时间")
|
||||
private LocalDateTime payTime;
|
||||
|
||||
@ApiModelProperty(value = "商品原价（总）", required = true, example = "1000", notes = "单位：分")
|
||||
private Integer originalPrice;
|
||||
|
||||
@ApiModelProperty(value = "订单原价（总）", required = true, example = "1000", notes = "单位：分")
|
||||
private Integer orderPrice;
|
||||
|
||||
@ApiModelProperty(value = "订单优惠（总）", required = true, example = "100", notes = "单位：分")
|
||||
private Integer discountPrice;
|
||||
|
||||
@ApiModelProperty(value = "运费金额", required = true, example = "100", notes = "单位：分")
|
||||
private Integer deliveryPrice;
|
||||
|
||||
@ApiModelProperty(value = "订单调价（总）", required = true, example = "100", notes = "单位：分")
|
||||
private Integer adjustPrice;
|
||||
|
||||
@ApiModelProperty(value = "应付金额（总）", required = true, example = "1000", notes = "单位：分")
|
||||
private Integer payPrice;
|
||||
|
||||
// ========== 收件 + 物流基本信息 ==========
|
||||
|
||||
@ApiModelProperty(value = "发货物流单号", example = "1024")
|
||||
private String logisticsNo;
|
||||
|
||||
@ApiModelProperty(value = "发货时间")
|
||||
private LocalDateTime deliveryTime;
|
||||
|
||||
@ApiModelProperty(value = "收货时间")
|
||||
private LocalDateTime receiveTime;
|
||||
|
||||
@ApiModelProperty(value = "收件人名称", required = true, example = "张三")
|
||||
private String receiverName;
|
||||
|
||||
@ApiModelProperty(value = "收件人手机", required = true, example = "13800138000")
|
||||
private String receiverMobile;
|
||||
|
||||
@ApiModelProperty(value = "收件人地区编号", required = true, example = "110000")
|
||||
private Integer receiverAreaId;
|
||||
|
||||
@ApiModelProperty(value = "收件人地区名字", required = true, example = "上海 上海市 普陀区")
|
||||
private String receiverAreaName;
|
||||
|
||||
@ApiModelProperty(value = "收件人邮编", required = true, example = "100000")
|
||||
private Integer receiverPostCode;
|
||||
|
||||
@ApiModelProperty(value = "收件人详细地址", required = true, example = "中关村大街 1 号")
|
||||
private String receiverDetailAddress;
|
||||
|
||||
// ========== 售后基本信息 ==========
|
||||
|
||||
// ========== 营销基本信息 ==========
|
||||
|
||||
@ApiModelProperty(value = "优惠劵编号", example = "1024")
|
||||
private Long couponId;
|
||||
|
||||
@ApiModelProperty(value = "优惠劵减免金额", required = true, example = "100", notes = "单位：分")
|
||||
private Integer couponPrice;
|
||||
|
||||
@ApiModelProperty(value = "积分抵扣的金额", required = true, example = "100", notes = "单位：分")
|
||||
private Integer pointPrice;
|
||||
|
||||
/**
|
||||
* 订单项数组
|
||||
*/
|
||||
private List<Item> items;
|
||||
|
||||
@ApiModel("用户 App - 交易订单的分页项的订单项目")
|
||||
@Data
|
||||
public static class Item {
|
||||
|
||||
@ApiModelProperty(value = "编号", required = true, example = "1")
|
||||
private Long id;
|
||||
|
||||
@ApiModelProperty(value = "商品 SPU 编号", required = true, example = "1")
|
||||
private Long spuId;
|
||||
|
||||
@ApiModelProperty(value = "商品 SPU 名称", required = true, example = "芋道源码")
|
||||
private String spuName;
|
||||
|
||||
@ApiModelProperty(value = "商品 SKU 编号", required = true, example = "1")
|
||||
private Long skuId;
|
||||
|
||||
@ApiModelProperty(value = "商品图片", required = true, example = "https://www.iocoder.cn/1.png")
|
||||
private String picUrl;
|
||||
|
||||
@ApiModelProperty(value = "购买数量", required = true, example = "1")
|
||||
private Integer count;
|
||||
|
||||
@ApiModelProperty(value = "商品原价（总）", required = true, example = "100", notes = "单位：分")
|
||||
private Integer originalPrice;
|
||||
|
||||
@ApiModelProperty(value = "商品原价（单）", required = true, example = "100", notes = "单位：分")
|
||||
private Integer originalUnitPrice;
|
||||
|
||||
/**
|
||||
* 属性数组
|
||||
*/
|
||||
private List<AppProductPropertyValueDetailRespVO> properties;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,54 +0,0 @@
|
||||
package cn.iocoder.yudao.module.trade.controller.app.order.vo;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
// TODO 芋艿：字段优化
|
||||
@ApiModel("交易订单项 Response VO")
|
||||
@Data
|
||||
public class AppTradeOrderItemRespVO {
|
||||
|
||||
@ApiModelProperty(value = "id自增长", required = true)
|
||||
private Integer id;
|
||||
@ApiModelProperty(value = "订单编号", required = true)
|
||||
private Integer orderId;
|
||||
@ApiModelProperty(value = "订单项状态", required = true)
|
||||
private Integer status;
|
||||
@ApiModelProperty(value = "商品 SKU 编号", required = true)
|
||||
private Integer skuId;
|
||||
@ApiModelProperty(value = "商品 SPU 编号", required = true)
|
||||
private Integer spuId;
|
||||
@ApiModelProperty(value = "商品名字", required = true)
|
||||
private String skuName;
|
||||
@ApiModelProperty(value = "图片名字", required = true)
|
||||
private String skuImage;
|
||||
@ApiModelProperty(value = "商品数量", required = true)
|
||||
private Integer quantity;
|
||||
@ApiModelProperty(value = "原始单价，单位：分", required = true)
|
||||
private Integer originPrice;
|
||||
@ApiModelProperty(value = "购买单价，单位：分", required = true)
|
||||
private Integer buyPrice;
|
||||
@ApiModelProperty(value = "最终价格，单位：分", required = true)
|
||||
private Integer presentPrice;
|
||||
@ApiModelProperty(value = "购买总金额，单位：分", required = true)
|
||||
private Integer buyTotal;
|
||||
@ApiModelProperty(value = "优惠总金额，单位：分", required = true)
|
||||
private Integer discountTotal;
|
||||
@ApiModelProperty(value = "最终总金额，单位：分", required = true)
|
||||
private Integer presentTotal;
|
||||
@ApiModelProperty(value = "退款总金额，单位：分", required = true)
|
||||
private Integer refundTotal;
|
||||
@ApiModelProperty(value = "物流id")
|
||||
private Integer logisticsId;
|
||||
@ApiModelProperty(value = "售后状态", required = true)
|
||||
private Integer afterSaleStatus;
|
||||
@ApiModelProperty(value = "售后订单编号")
|
||||
private Integer afterSaleOrderId;
|
||||
@ApiModelProperty(value = "创建时间", required = true)
|
||||
private LocalDateTime createTime;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,66 @@
|
||||
package cn.iocoder.yudao.module.trade.controller.app.order.vo;
|
||||
|
||||
import cn.iocoder.yudao.module.trade.controller.app.base.property.AppProductPropertyValueDetailRespVO;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@ApiModel("用户 App - 订单交易的分页项 Response VO")
|
||||
@Data
|
||||
public class AppTradeOrderPageItemRespVO {
|
||||
|
||||
@ApiModelProperty(value = "订单编号", required = true, example = "1024")
|
||||
private Long id;
|
||||
|
||||
@ApiModelProperty(value = "订单流水号", required = true, example = "1146347329394184195")
|
||||
private String no;
|
||||
|
||||
@ApiModelProperty(value = "订单状态", required = true, example = "1", notes = "参见 TradeOrderStatusEnum 枚举")
|
||||
private Integer status;
|
||||
|
||||
@ApiModelProperty(value = "购买的商品数量", required = true, example = "10")
|
||||
private Integer productCount;
|
||||
|
||||
/**
|
||||
* 订单项数组
|
||||
*/
|
||||
private List<Item> items;
|
||||
|
||||
@ApiModel("用户 App - 交易订单的明细的订单项目")
|
||||
@Data
|
||||
public static class Item {
|
||||
|
||||
@ApiModelProperty(value = "编号", required = true, example = "1")
|
||||
private Long id;
|
||||
|
||||
@ApiModelProperty(value = "商品 SPU 编号", required = true, example = "1")
|
||||
private Long spuId;
|
||||
|
||||
@ApiModelProperty(value = "商品 SPU 名称", required = true, example = "芋道源码")
|
||||
private String spuName;
|
||||
|
||||
@ApiModelProperty(value = "商品 SKU 编号", required = true, example = "1")
|
||||
private Long skuId;
|
||||
|
||||
@ApiModelProperty(value = "商品图片", required = true, example = "https://www.iocoder.cn/1.png")
|
||||
private String picUrl;
|
||||
|
||||
@ApiModelProperty(value = "购买数量", required = true, example = "1")
|
||||
private Integer count;
|
||||
|
||||
@ApiModelProperty(value = "商品原价（总）", required = true, example = "100", notes = "单位：分")
|
||||
private Integer originalPrice;
|
||||
|
||||
@ApiModelProperty(value = "商品原价（单）", required = true, example = "100", notes = "单位：分")
|
||||
private Integer originalUnitPrice;
|
||||
|
||||
/**
|
||||
* 属性数组
|
||||
*/
|
||||
private List<AppProductPropertyValueDetailRespVO> properties;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,18 +1,19 @@
|
||||
package cn.iocoder.yudao.module.trade.controller.app.order.vo;
|
||||
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageParam;
|
||||
import cn.iocoder.yudao.framework.common.validation.InEnum;
|
||||
import cn.iocoder.yudao.module.trade.enums.order.TradeOrderStatusEnum;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
// TODO 芋艿：字段优化
|
||||
@ApiModel("交易订单分页 Request VO")
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class AppTradeOrderPageReqVO extends PageParam {
|
||||
|
||||
@ApiModelProperty(value = "订单状态", example = "1", notes = "参见 TradeOrderStatusEnum 枚举")
|
||||
private Integer orderStatus;
|
||||
@InEnum(value = TradeOrderStatusEnum.class, message = "订单状态必须是 {value}")
|
||||
private Integer status;
|
||||
|
||||
}
|
||||
|
||||
@ -1,73 +0,0 @@
|
||||
package cn.iocoder.yudao.module.trade.controller.app.order.vo;
|
||||
|
||||
import lombok.*;
|
||||
import io.swagger.annotations.*;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.*;
|
||||
|
||||
// TODO 芋艿：字段优化
|
||||
@ApiModel("订单交易 Response VO")
|
||||
@Data
|
||||
public class AppTradeOrderRespVO {
|
||||
|
||||
@ApiModelProperty(value = "订单编号", required = true)
|
||||
private Integer id;
|
||||
@ApiModelProperty(value = "用户编号", required = true)
|
||||
private Integer userId;
|
||||
@ApiModelProperty(value = "订单单号", required = true)
|
||||
private String orderNo;
|
||||
@ApiModelProperty(value = "订单状态", required = true)
|
||||
private Integer orderStatus;
|
||||
@ApiModelProperty(value = "备注")
|
||||
private String remark;
|
||||
@ApiModelProperty(value = "订单结束时间")
|
||||
private LocalDateTime endTime;
|
||||
@ApiModelProperty(value = "订单金额(总金额)，单位：分", required = true)
|
||||
private Integer buyPrice;
|
||||
@ApiModelProperty(value = "优惠总金额，单位：分", required = true)
|
||||
private Integer discountPrice;
|
||||
@ApiModelProperty(value = "物流金额，单位：分", required = true)
|
||||
private Integer logisticsPrice;
|
||||
@ApiModelProperty(value = "最终金额，单位：分", required = true)
|
||||
private Integer presentPrice;
|
||||
@ApiModelProperty(value = "支付金额，单位：分", required = true)
|
||||
private Integer payPrice;
|
||||
@ApiModelProperty(value = "退款金额，单位：分", required = true)
|
||||
private Integer refundPrice;
|
||||
@ApiModelProperty(value = "付款时间")
|
||||
private LocalDateTime payTime;
|
||||
@ApiModelProperty(value = "支付订单编号")
|
||||
private Integer payTransactionId;
|
||||
@ApiModelProperty(value = "支付渠道")
|
||||
private Integer payChannel;
|
||||
@ApiModelProperty(value = "配送类型", required = true)
|
||||
private Integer deliveryType;
|
||||
@ApiModelProperty(value = "发货时间")
|
||||
private LocalDateTime deliveryTime;
|
||||
@ApiModelProperty(value = "收货时间")
|
||||
private LocalDateTime receiveTime;
|
||||
@ApiModelProperty(value = "收件人名称", required = true)
|
||||
private String receiverName;
|
||||
@ApiModelProperty(value = "手机号", required = true)
|
||||
private String receiverMobile;
|
||||
@ApiModelProperty(value = "地区编码", required = true)
|
||||
private Integer receiverAreaCode;
|
||||
@ApiModelProperty(value = "收件详细地址", required = true)
|
||||
private String receiverDetailAddress;
|
||||
@ApiModelProperty(value = "售后状态", required = true)
|
||||
private Integer afterSaleStatus;
|
||||
@ApiModelProperty(value = "优惠劵编号")
|
||||
private Integer couponCardId;
|
||||
@ApiModelProperty(value = "创建时间", required = true)
|
||||
private LocalDateTime createTime;
|
||||
|
||||
/**
|
||||
* 订单项数组
|
||||
*
|
||||
* // TODO 芋艿，后续考虑怎么优化下，目前是内嵌了别的 dto
|
||||
*/
|
||||
private List<AppTradeOrderItemRespVO> orderItems;
|
||||
|
||||
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
const { http } = uni.$u
|
||||
|
||||
//获得订单交易分页
|
||||
export const getOrderPageData = params => http.get('/trade/order/page', { params })
|
||||
// 获得订单交易分页
|
||||
export const getOrderPage = params => http.get('/trade/order/page', { params })
|
||||
|
||||
Loading…
Reference in New Issue