huangge1199/vue-pro
1
0
Fork 0
mirror of https://gitee.com/huangge1199_admin/vue-pro.git synced 2024-11-26 01:01:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

mall：订单列表：增加订单类型的接入

Browse Source
This commit is contained in:
YunaiV 2023-05-20 11:22:43 +08:00
parent be7c664e07
commit e745bb6675
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/order/TradeOrderTypeEnum.java
View File

@ -17,8 +17,11 @@ public enum TradeOrderTypeEnum implements IntArrayValuable {
NORMAL(0, "普通订单"),
SECKILL(1, "秒杀订单"),
TEAM(2, "拼团订单"),
BARGAIN(3, "砍价订单");
// TODO 芋艿：如下三个字段，名字需要改下，等后面表设计完成后。
KANJIA(2, "砍价订单"),
PINTUAN(3, "拼团订单"),
YUSHOU(4, "预售订单"),
;
public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(TradeOrderTypeEnum::getType).toArray();

3
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
View File

@ -180,8 +180,11 @@ public class AppTradeOrderController {
orderCount.put("allCount", tradeOrderService.getOrderCount(getLoginUserId(), null, null));
// 待付款（未支付）
orderCount.put("unpaidCount", tradeOrderService.getOrderCount(getLoginUserId(), TradeOrderStatusEnum.UNPAID.getStatus(), null));
// 待发货
orderCount.put("undeliveredCount", tradeOrderService.getOrderCount(getLoginUserId(), TradeOrderStatusEnum.UNDELIVERED.getStatus(), null));
// 待收货
orderCount.put("deliveredCount", tradeOrderService.getOrderCount(getLoginUserId(), TradeOrderStatusEnum.DELIVERED.getStatus(), null));
// 待评价
orderCount.put("uncommentedCount", tradeOrderService.getOrderCount(getLoginUserId(), TradeOrderStatusEnum.COMPLETED.getStatus(), false));
return success(orderCount);
}

7
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderPageItemRespVO.java
View File

@ -4,6 +4,7 @@ import cn.iocoder.yudao.module.trade.controller.app.order.vo.item.AppTradeOrderI
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.util.Date;
import java.util.List;
@Schema(description = "用户 App - 订单交易的分页项 Response VO")
@ -16,6 +17,9 @@ public class AppTradeOrderPageItemRespVO {
@Schema(description = "订单流水号", required = true, example = "1146347329394184195")
private String no;
@Schema(description = "订单类型", required = true, example = "0")
private Integer type;
@Schema(description = "订单状态", required = true, example = "1")
private Integer status;
@ -25,6 +29,9 @@ public class AppTradeOrderPageItemRespVO {
@Schema(description = "是否评价", required = true, example = "true")
private Boolean commentStatus;
@Schema(description = "创建时间", required = true)
private Date createTime;
// ========== 价格 + 支付基本信息 ==========
@Schema(description = "应付金额，单位：分", required = true, example = "1000")