From b0fcd96dfe9a99a0bd8304f71cf52e22c271d859 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Fri, 23 Jun 2023 00:26:04 +0800 Subject: [PATCH] =?UTF-8?q?mall=20+=20promotion=EF=BC=9A=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=A0=8D=E4=BB=B7=E8=AE=B0=E5=BD=95=E7=9A=84=20mock?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bargain/AppBargainRecordController.java | 2 -- .../record/AppBargainRecordDetailRespVO.java | 25 ++----------------- 2 files changed, 2 insertions(+), 25 deletions(-) diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/AppBargainRecordController.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/AppBargainRecordController.java index 78d17c816..0df8db49a 100644 --- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/AppBargainRecordController.java +++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/AppBargainRecordController.java @@ -61,8 +61,6 @@ public class AppBargainRecordController { detail.setPrice(200); detail.setPayPrice(180); detail.setStatus(1); - detail.setAction(AppBargainRecordDetailRespVO.ACTION_ORDER_CREATE); - detail.setHelpAction(AppBargainRecordDetailRespVO.HELP_ACTION_NONE); detail.setExpireTime(LocalDateTimeUtils.addTime(Duration.ofDays(2))); return success(detail); } diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/record/AppBargainRecordDetailRespVO.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/record/AppBargainRecordDetailRespVO.java index 2b64924a4..17997015d 100644 --- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/record/AppBargainRecordDetailRespVO.java +++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/record/AppBargainRecordDetailRespVO.java @@ -9,12 +9,6 @@ import java.time.LocalDateTime; @Data public class AppBargainRecordDetailRespVO { - public static final int ACTION_NONE = 1; // 参与动作 - 未参与，可参与 - public static final int ACTION_WAITING = 2; // 参与动作 - 参与中，等待砍价 - public static final int ACTION_SUCCESS = 3; // 参与动作 - 砍价成功，待下单 - public static final int ACTION_ORDER_CREATE = 4; // 参与动作 - 已下单，未付款 - public static final int ACTION_ORDER_PAY = 5; // 参与动作 - 已下单，已付款 - public static final int HELP_ACTION_NONE = 1; // 帮砍动作 - 未帮砍，可以帮砍 public static final int HELP_ACTION_FULL = 2; // 帮砍动作 - 未帮砍，无法帮砍（可帮砍次数已满) public static final int HELP_ACTION_SUCCESS = 3; // 帮砍动作 - 已帮砍 @@ -31,24 +25,9 @@ public class AppBargainRecordDetailRespVO { private LocalDateTime expireTime; - private Long orderId; // 有且仅在自己的订单才返回 + private Long orderId; + private Boolean payStatus; - private Integer action; private Integer helpAction; - // 【未参与】1-可以参与砍价：storeBargainUser 为空； - // 【未参与】2-参与次数已满：storeBargainUser 为空，但是砍价次数已满；storeBargainUser 非空已支付，但是砍价次数已满 TODO 芋艿：这个就不做了 - // 【参与中】3-砍价中：storeBargainUser 非空，人数未满 - // 【参与中】4-已完成：storeBargainUser 非空，未创建订单 - - // 支付的情况； - // 8-已生成订单未支付：storeBargainUser 不为空（status = 3），但是订单未支付； - // 9-已支付：storeBargainUser 不为空（status = 3），且订单已支付； - // 10-取消支付：storeBargainUser 不为空（status = 3），取消支付；【可忽略】 - - // help 的情况； - // 5-可以帮砍：和 3 对应； - // 6-已帮砍：其他人的，有帮砍过； - // 7-帮砍次数已满：其他人的，帮砍次数已满 - }