From cb2b53c615599ae0ca50fbdaa2de83be047c94fe Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 14 四月 2022 15:13:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/lyq_battery_shop' into lyq_battery_shop
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComBatteryCommodityActivityApi.java | 45 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 45 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComBatteryCommodityActivityApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComBatteryCommodityActivityApi.java
index 0c3f2d4..81df0a7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComBatteryCommodityActivityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComBatteryCommodityActivityApi.java
@@ -4,6 +4,7 @@
import com.panzhihua.common.model.dtos.common.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.common.ComBatteryCommodityActivityVo;
+import com.panzhihua.common.model.vos.common.ComBatteryCommodityOrderBargainVo;
import com.panzhihua.common.model.vos.common.ComBatteryCommodityOrderCollageTeamVo;
import com.panzhihua.common.service.community.ComBatteryCommodityActivityFeign;
import com.panzhihua.common.service.community.ComBatteryCommodityOrderCollageTeamFeign;
@@ -104,6 +105,50 @@
return this.comBatteryCommodityActivityService.startFight(orderDto);
}
+ /**
+ * 创建砍价订单
+ * @param orderDto 请求参数
+ * @return 创建订单结果
+ */
+ @ApiOperation(value = "创建砍价订单")
+ @PostMapping("/start/bargain")
+ public R startBargain(@RequestBody StartBargainOrderDto orderDto){
+ return this.comBatteryCommodityActivityService.startBargain(orderDto);
+ }
+
+ /**
+ * 帮好友砍价
+ * @param orderDto 请求参数
+ * @return 创建订单结果
+ */
+ @ApiOperation(value = "帮好友砍价")
+ @PostMapping("/start/user/bargain")
+ public R startUserBargain(@RequestBody StartUserBargainOrderDto orderDto){
+ return this.comBatteryCommodityActivityService.startUserBargain(orderDto);
+ }
+
+ /**
+ * 查询砍价记录详情
+ * @param id 砍价记录id
+ * @return 创建订单结果
+ */
+ @ApiOperation(value = "查询砍价记录详情",response = ComBatteryCommodityOrderBargainVo.class)
+ @GetMapping("/user/bargain")
+ public R getUserBargain(@RequestParam("id") Long id){
+ return this.comBatteryCommodityActivityService.getUserBargain(id);
+ }
+
+ /**
+ * 创建秒杀订单
+ * @param orderDto 请求参数
+ * @return 创建订单结果
+ */
+ @ApiOperation(value = "创建秒杀订单")
+ @PostMapping("/start/seckill")
+ public R startSeckill(@RequestBody StartSeckillOrderDto orderDto){
+ return this.comBatteryCommodityActivityService.startSeckill(orderDto);
+ }
+
}
--
Gitblit v1.7.1