From b30e1a48f2bc5f65a0efd2e69e090fed2d7a627c Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 17 十一月 2022 15:56:43 +0800
Subject: [PATCH] #feat 订单退款和查询
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComBatteryCommodityActivityController.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 48 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 04edfcc..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,7 +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;
@@ -26,6 +28,10 @@
private ComBatteryCommodityActivityService comBatteryCommodityActivityService;
@Resource
private ComBatteryCommodityOrderCollageTeamService orderCollageTeamService;
+ @Resource
+ private ComBatteryCommodityOrderBargainService orderBargainService;
+ @Resource
+ private ComBatteryCommodityOrderService commodityOrderService;
/**
* description queryByPage 分页查询
@@ -88,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);
}
/**
@@ -125,5 +131,45 @@
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