BJ_ZTEITS-Developers / parking-cloud-yudao

Commit e745bb667504424801f140b7f8e4ac2c4e57e806

Authored by YunaiV
1 parent be7c664e

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

Inline Side-by-side
Showing 3 changed files with 15 additions and 2 deletions
yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/order/TradeOrderTypeEnum.java
  View file @e745bb6
... ... @@ -17,8 +17,11 @@ public enum TradeOrderTypeEnum implements IntArrayValuable {
17 17  
18 18 NORMAL(0, "普通订单"),
19 19 SECKILL(1, "秒杀订单"),
20   - TEAM(2, "拼团订单"),
21   - BARGAIN(3, "砍价订单");
  20 + // TODO 芋艿：如下三个字段，名字需要改下，等后面表设计完成后。
  21 + KANJIA(2, "砍价订单"),
  22 + PINTUAN(3, "拼团订单"),
  23 + YUSHOU(4, "预售订单"),
  24 + ;
22 25  
23 26 public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(TradeOrderTypeEnum::getType).toArray();
24 27  
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
  View file @e745bb6
... ... @@ -180,8 +180,11 @@ public class AppTradeOrderController {
180 180 orderCount.put("allCount", tradeOrderService.getOrderCount(getLoginUserId(), null, null));
181 181 // 待付款（未支付）
182 182 orderCount.put("unpaidCount", tradeOrderService.getOrderCount(getLoginUserId(), TradeOrderStatusEnum.UNPAID.getStatus(), null));
  183 + // 待发货
183 184 orderCount.put("undeliveredCount", tradeOrderService.getOrderCount(getLoginUserId(), TradeOrderStatusEnum.UNDELIVERED.getStatus(), null));
  185 + // 待收货
184 186 orderCount.put("deliveredCount", tradeOrderService.getOrderCount(getLoginUserId(), TradeOrderStatusEnum.DELIVERED.getStatus(), null));
  187 + // 待评价
185 188 orderCount.put("uncommentedCount", tradeOrderService.getOrderCount(getLoginUserId(), TradeOrderStatusEnum.COMPLETED.getStatus(), false));
186 189 return success(orderCount);
187 190 }
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderPageItemRespVO.java
  View file @e745bb6
... ... @@ -4,6 +4,7 @@ import cn.iocoder.yudao.module.trade.controller.app.order.vo.item.AppTradeOrderI
4 4 import io.swagger.v3.oas.annotations.media.Schema;
5 5 import lombok.Data;
6 6  
  7 +import java.util.Date;
7 8 import java.util.List;
8 9  
9 10 @Schema(description = "用户 App - 订单交易的分页项 Response VO")
... ... @@ -16,6 +17,9 @@ public class AppTradeOrderPageItemRespVO {
16 17 @Schema(description = "订单流水号", required = true, example = "1146347329394184195")
17 18 private String no;
18 19  
  20 + @Schema(description = "订单类型", required = true, example = "0")
  21 + private Integer type;
  22 +
19 23 @Schema(description = "订单状态", required = true, example = "1")
20 24 private Integer status;
21 25  
... ... @@ -25,6 +29,9 @@ public class AppTradeOrderPageItemRespVO {
25 29 @Schema(description = "是否评价", required = true, example = "true")
26 30 private Boolean commentStatus;
27 31  
  32 + @Schema(description = "创建时间", required = true)
  33 + private Date createTime;
  34 +
28 35 // ========== 价格 + 支付基本信息 ==========
29 36  
30 37 @Schema(description = "应付金额，单位：分", required = true, example = "1000")
... ...