From 30c1c9d16a57d2bbc7cd1511d02c5ddcc6a143f6 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 08 Jun 2021 16:10:44 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/otc/controller/OtcOrderController.java | 39 ++++++++++++++++++++++++++++++++++-----
1 files changed, 34 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/otc/controller/OtcOrderController.java b/src/main/java/com/xcong/excoin/modules/otc/controller/OtcOrderController.java
index 40618bd..125b974 100644
--- a/src/main/java/com/xcong/excoin/modules/otc/controller/OtcOrderController.java
+++ b/src/main/java/com/xcong/excoin/modules/otc/controller/OtcOrderController.java
@@ -2,14 +2,17 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xcong.excoin.common.LoginUserUtils;
import com.xcong.excoin.common.response.Result;
-import com.xcong.excoin.modules.otc.dto.HasPayDto;
-import com.xcong.excoin.modules.otc.dto.OrderListDto;
-import com.xcong.excoin.modules.otc.dto.OtcOrderAddDto;
+import com.xcong.excoin.modules.member.entity.MemberEntity;
+import com.xcong.excoin.modules.otc.dao.OtcReturnMoneyDao;
+import com.xcong.excoin.modules.otc.dto.*;
import com.xcong.excoin.modules.otc.service.OtcOrderService;
import com.xcong.excoin.modules.otc.vo.BuyOrderDetailVo;
import com.xcong.excoin.modules.otc.vo.OrderListVo;
import com.xcong.excoin.modules.otc.vo.SaleOrderDetailVo;
+import com.xcong.excoin.modules.otc.vo.TeamVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
@@ -20,6 +23,10 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.Map;
+
@Slf4j
@Validated
@RestController
@@ -29,6 +36,7 @@
public class OtcOrderController {
private final OtcOrderService otcOrderService;
+ private final OtcReturnMoneyDao otcReturnMoneyDao;
@ApiOperation(value = "我要购买")
@PostMapping(value = "/buy")
@@ -85,9 +93,30 @@
}
@ApiOperation(value = "取消订单")
- @PostMapping(value = "/cancelOrder/{id}")
- public Result cancelOrder(Long id) {
+ @PostMapping(value = "/cancelUserOrder/{id}")
+ public Result cancelUserOrder(@PathVariable("id") Long id) {
otcOrderService.cancelOrder(id);
return Result.ok("操作成功");
}
+
+ @ApiOperation(value = "申诉")
+ @PostMapping(value = "/orderApeal")
+ public Result orderApeal(@RequestBody OrderApealDto orderApealDto) {
+ return otcOrderService.orderApeal(orderApealDto);
+ }
+
+ @ApiOperation(value = "获取我的团队")
+ @PostMapping(value = "/findTeamList")
+ public Result teamList(@RequestBody TeamDto teamDto) {
+ Page<TeamVo> page = new Page<>(teamDto.getPageNum(), teamDto.getPageSize());
+
+ MemberEntity member = LoginUserUtils.getAppLoginUser();
+ IPage<TeamVo> data = otcReturnMoneyDao.selectMyTeamAmountInPage(member.getInviteId(), member.getId(), page);
+ BigDecimal totalAmount = otcReturnMoneyDao.selectTotalAmount(member.getId());
+ Map<String, Object> result = new HashMap<>();
+ result.put("totalCnt", data.getTotal());
+ result.put("totalAmount", totalAmount);
+ result.put("result", data.getRecords());
+ return Result.ok(result);
+ }
}
--
Gitblit v1.9.1