From e4de90990c948898db5d0c2fc080853a144728c3 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期三, 13 四月 2022 09:38:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/lyq_battery_shop' into lyq_battery_shop
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComBatteryCommodityActivityController.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 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..04edfcc 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,7 @@
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.ComBatteryCommodityOrderCollageTeamService;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -23,6 +24,8 @@
@Resource
private ComBatteryCommodityActivityService comBatteryCommodityActivityService;
+ @Resource
+ private ComBatteryCommodityOrderCollageTeamService orderCollageTeamService;
/**
* description queryByPage 分页查询
@@ -113,5 +116,14 @@
return this.comBatteryCommodityActivityService.updateStatus(id,status);
}
+ /**
+ * 创建拼团订单
+ * @param orderDto 请求参数
+ * @return 创建订单结果
+ */
+ @PostMapping("/start/fight")
+ public R startFight(@RequestBody StartFightOrderDto orderDto){
+ return this.orderCollageTeamService.startFight(orderDto);
+ }
}
--
Gitblit v1.7.1