From d89d4a28653657528dc0718f1aa55e1c84ad1e6f Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 19 四月 2022 10:36:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/lyq_battery_shop' into lyq_battery_shop
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryCommodityActivityFeign.java | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryCommodityActivityFeign.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryCommodityActivityFeign.java
index 41c66b3..8e48190 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryCommodityActivityFeign.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComBatteryCommodityActivityFeign.java
@@ -72,7 +72,7 @@
* @date 2022-03-29 13:17:41
*/
@GetMapping("/detail")
- R detailById(@RequestParam("id") Long id);
+ R detailById(@RequestParam("id") Long id,@RequestParam("userId") Long userId);
/**
* description queryByList 查询列表
@@ -101,4 +101,36 @@
*/
@PostMapping("/start/fight")
R startFight(@RequestBody StartFightOrderDto orderDto);
+
+ /**
+ * 创建砍价订单
+ * @param orderDto 请求参数
+ * @return 创建订单结果
+ */
+ @PostMapping("/start/bargain")
+ R startBargain(@RequestBody StartBargainOrderDto orderDto);
+
+ /**
+ * 帮好友砍价
+ * @param orderDto 请求参数
+ * @return 创建订单结果
+ */
+ @PostMapping("/start/user/bargain")
+ R startUserBargain(@RequestBody StartUserBargainOrderDto orderDto);
+
+ /**
+ * 查询砍价记录详情
+ * @param id 砍价记录id
+ * @return 创建订单结果
+ */
+ @GetMapping("/user/bargain")
+ R getUserBargain(@RequestParam("id") Long id);
+
+ /**
+ * 创建秒杀订单
+ * @param orderDto 请求参数
+ * @return 创建订单结果
+ */
+ @PostMapping("/start/seckill")
+ R startSeckill(@RequestBody StartSeckillOrderDto orderDto);
}
--
Gitblit v1.7.1