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/applets/src/main/java/com/panzhihua/applets/api/ComBatteryCommodityActivityApi.java | 93 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 84 insertions(+), 9 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 48d3652..665b19a 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
@@ -1,12 +1,11 @@
package com.panzhihua.applets.api;
import com.panzhihua.common.controller.BaseController;
-import com.panzhihua.common.model.dtos.common.AddComBatteryCommodityActivityDto;
-import com.panzhihua.common.model.dtos.common.EditComBatteryCommodityActivityDto;
-import com.panzhihua.common.model.dtos.common.PageComBatteryCommodityActivityDto;
-import com.panzhihua.common.model.dtos.common.PageComBatteryCommodityOrderCollageTeamDto;
+import com.panzhihua.common.model.dtos.common.*;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
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;
@@ -50,7 +49,10 @@
@ApiOperation(value = "分页查询活动列表",response = ComBatteryCommodityActivityVo.class)
@PostMapping("/page")
public R queryByPage(@RequestBody PageComBatteryCommodityActivityDto comBatteryCommodityActivity) {
- comBatteryCommodityActivity.setStatus(1);
+ comBatteryCommodityActivity.setIsApplets(1);
+ if(comBatteryCommodityActivity.getIsUser().equals(1)){
+ comBatteryCommodityActivity.setUserId(this.getUserId());
+ }
return this.comBatteryCommodityActivityService.queryByPage(comBatteryCommodityActivity);
}
@@ -65,7 +67,12 @@
@ApiOperation(value = "查询活动详情",response = ComBatteryCommodityActivityVo.class)
@GetMapping("/detail")
public R detailById(@RequestParam("id") Long id) {
- return this.comBatteryCommodityActivityService.detailById(id);
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ Long userId = 0L;
+ if(loginUserInfo != null){
+ userId = loginUserInfo.getUserId();
+ }
+ return this.comBatteryCommodityActivityService.detailById(id,userId);
}
/**
@@ -79,7 +86,7 @@
@ApiOperation(value = "查询活动列表",response = ComBatteryCommodityActivityVo.class)
@PostMapping("/list")
public R queryByList(@RequestBody PageComBatteryCommodityActivityDto comBatteryCommodityActivity) {
- comBatteryCommodityActivity.setStatus(1);
+ comBatteryCommodityActivity.setIsApplets(1);
return this.comBatteryCommodityActivityService.queryByList(comBatteryCommodityActivity);
}
@@ -87,13 +94,81 @@
@PostMapping("/assorted/dough")
public R queryByAssortedDoughList(@RequestBody PageComBatteryCommodityOrderCollageTeamDto orderCollageTeamDto) {
orderCollageTeamDto.setStatus(1);
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if(loginUserInfo != null){
+ orderCollageTeamDto.setUserId(loginUserInfo.getUserId());
+ }
return this.orderCollageTeamService.queryByPage(orderCollageTeamDto);
}
@ApiOperation(value = "查询拼团团队详情",response = ComBatteryCommodityOrderCollageTeamVo.class)
- @PostMapping("/assorted/dough/detail")
+ @GetMapping("/assorted/dough/detail")
public R queryByAssortedDoughDetail(@RequestParam("id") Long id) {
- return this.orderCollageTeamService.detailById(id);
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ Long userId = 0L;
+ if(loginUserInfo != null){
+ userId = loginUserInfo.getUserId();
+ }
+ return this.orderCollageTeamService.detailById(id,userId);
+ }
+
+ /**
+ * 创建拼团订单
+ * @param orderDto 请求参数
+ * @return 创建订单结果
+ */
+ @ApiOperation(value = "创建拼团订单")
+ @PostMapping("/start/fight")
+ public R startFight(@RequestBody StartFightOrderDto orderDto){
+ orderDto.setUserId(this.getUserId());
+ return this.comBatteryCommodityActivityService.startFight(orderDto);
+ }
+
+ /**
+ * 创建砍价订单
+ * @param orderDto 请求参数
+ * @return 创建订单结果
+ */
+ @ApiOperation(value = "创建砍价订单")
+ @PostMapping("/start/bargain")
+ public R startBargain(@RequestBody StartBargainOrderDto orderDto){
+ orderDto.setUserId(this.getUserId());
+ return this.comBatteryCommodityActivityService.startBargain(orderDto);
+ }
+
+ /**
+ * 帮好友砍价
+ * @param orderDto 请求参数
+ * @return 创建订单结果
+ */
+ @ApiOperation(value = "帮好友砍价")
+ @PostMapping("/start/user/bargain")
+ public R startUserBargain(@RequestBody StartUserBargainOrderDto orderDto){
+ orderDto.setUserId(this.getUserId());
+ 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){
+ orderDto.setUserId(this.getUserId());
+ return this.comBatteryCommodityActivityService.startSeckill(orderDto);
}
--
Gitblit v1.7.1