From f1bcbc43e988d0d1a91bea66a9ebbf6d601e48c0 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 13 十月 2022 10:33:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComBatteryCommodityActivityController.java | 62 ++++++++++++++++++++++++++++++-
1 files changed, 60 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComBatteryCommodityActivityController.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComBatteryCommodityActivityController.java
index b435dae..70e5aea 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComBatteryCommodityActivityController.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComBatteryCommodityActivityController.java
@@ -3,6 +3,9 @@
import com.panzhihua.service_community.service.ComBatteryCommodityActivityService;
import com.panzhihua.common.model.dtos.common.*;
import com.panzhihua.common.model.vos.R;
+import com.panzhihua.service_community.service.ComBatteryCommodityOrderBargainService;
+import com.panzhihua.service_community.service.ComBatteryCommodityOrderCollageTeamService;
+import com.panzhihua.service_community.service.ComBatteryCommodityOrderService;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -23,6 +26,12 @@
@Resource
private ComBatteryCommodityActivityService comBatteryCommodityActivityService;
+ @Resource
+ private ComBatteryCommodityOrderCollageTeamService orderCollageTeamService;
+ @Resource
+ private ComBatteryCommodityOrderBargainService orderBargainService;
+ @Resource
+ private ComBatteryCommodityOrderService commodityOrderService;
/**
* description queryByPage 分页查询
@@ -85,8 +94,8 @@
* @date 2022-03-29 13:17:38
*/
@GetMapping("/detail")
- public R detailById(@RequestParam("id") Long id) {
- return this.comBatteryCommodityActivityService.detailById(id);
+ public R detailById(@RequestParam("id") Long id,@RequestParam("userId") Long userId) {
+ return this.comBatteryCommodityActivityService.detailById(id,userId);
}
/**
@@ -113,5 +122,54 @@
return this.comBatteryCommodityActivityService.updateStatus(id,status);
}
+ /**
+ * 创建拼团订单
+ * @param orderDto 请求参数
+ * @return 创建订单结果
+ */
+ @PostMapping("/start/fight")
+ public R startFight(@RequestBody StartFightOrderDto orderDto){
+ return this.orderCollageTeamService.startFight(orderDto);
+ }
+
+ /**
+ * 创建砍价订单
+ * @param orderDto 请求参数
+ * @return 创建订单结果
+ */
+ @PostMapping("/start/bargain")
+ public R startBargain(@RequestBody StartBargainOrderDto orderDto){
+ return this.orderBargainService.startBargain(orderDto);
+ }
+
+ /**
+ * 帮好友砍价
+ * @param orderDto 请求参数
+ * @return 创建订单结果
+ */
+ @PostMapping("/start/user/bargain")
+ public R startUserBargain(@RequestBody StartUserBargainOrderDto orderDto){
+ return this.orderBargainService.startUserBargain(orderDto);
+ }
+
+ /**
+ * 查询砍价记录详情
+ * @param id 砍价记录id
+ * @return 创建订单结果
+ */
+ @GetMapping("/user/bargain")
+ public R getUserBargain(@RequestParam("id") Long id){
+ return this.orderBargainService.getUserBargain(id);
+ }
+
+ /**
+ * 创建秒杀订单
+ * @param orderDto 请求参数
+ * @return 创建订单结果
+ */
+ @PostMapping("/start/seckill")
+ public R startSeckill(@RequestBody StartSeckillOrderDto orderDto){
+ return this.commodityOrderService.startSeckill(orderDto);
+ }
}
--
Gitblit v1.7.1