From 7572b8dbd4c41ca9b6437a032da2aa1a0fdd5444 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 17 May 2021 18:18:09 +0800
Subject: [PATCH] 20210517 云顶
---
src/main/java/com/xcong/excoin/modules/yunding/controller/BasicSettingController.java | 95 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 90 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/yunding/controller/BasicSettingController.java b/src/main/java/com/xcong/excoin/modules/yunding/controller/BasicSettingController.java
index 6d98dd6..f470794 100644
--- a/src/main/java/com/xcong/excoin/modules/yunding/controller/BasicSettingController.java
+++ b/src/main/java/com/xcong/excoin/modules/yunding/controller/BasicSettingController.java
@@ -1,19 +1,22 @@
package com.xcong.excoin.modules.yunding.controller;
+import com.xcong.excoin.common.annotation.ControllerEndpoint;
import com.xcong.excoin.common.controller.BaseController;
import com.xcong.excoin.common.entity.FebsResponse;
import com.xcong.excoin.common.entity.QueryRequest;
-import com.xcong.excoin.modules.trademanage.entity.ContractOrderEntity;
+import com.xcong.excoin.modules.helpCenter.entity.HelpCenterArticleEntity;
+import com.xcong.excoin.modules.member.entity.MemberEntity;
import com.xcong.excoin.modules.yunding.entity.YdOrderEntity;
import com.xcong.excoin.modules.yunding.entity.YdProductEntity;
import com.xcong.excoin.modules.yunding.service.IBasicSettingService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+import java.lang.reflect.Member;
import java.util.Map;
@Slf4j
@@ -26,13 +29,23 @@
private final IBasicSettingService basicSettingService;
/**
- * 订单查询
+ * 算力订单查询
*/
@GetMapping("getOrderList")
public FebsResponse getOrderList(YdOrderEntity ydOrderEntity, QueryRequest request) {
Map<String, Object> data = getDataTable(basicSettingService.getOrderList(ydOrderEntity, request));
return new FebsResponse().success().data(data);
}
+
+ /**
+ * 代理订单查询
+ */
+ @GetMapping("getAgentOrderList")
+ public FebsResponse getAgentOrderList(YdOrderEntity ydOrderEntity, QueryRequest request) {
+ Map<String, Object> data = getDataTable(basicSettingService.getAgentOrderList(ydOrderEntity, request));
+ return new FebsResponse().success().data(data);
+ }
+
/**
* 产品查询
*/
@@ -41,6 +54,7 @@
Map<String, Object> data = getDataTable(basicSettingService.getYdProductList(ydProductEntity, request));
return new FebsResponse().success().data(data);
}
+
/**
* 会员算力查询
*/
@@ -49,4 +63,75 @@
Map<String, Object> data = getDataTable(basicSettingService.getYdMemberList(ydOrderEntity, request));
return new FebsResponse().success().data(data);
}
+
+ /**
+ * 会员算力查询---返利详情
+ */
+ @GetMapping("/seeAgentReturn")
+ public FebsResponse seeAgentReturn(QueryRequest request, MemberEntity memberEntity, Integer parentId) {
+ if(parentId==null){
+ ViewController.idFromMember=0;
+ }
+ memberEntity.setId(ViewController.idFromMember);
+ Map<String, Object> dataTable = getDataTable(basicSettingService.seeAgentReturn(request, memberEntity));
+ return new FebsResponse().success().data(dataTable);
+ }
+
+ /**
+ * 会员算力查询---返利详情
+ */
+ @GetMapping("/seeReturn")
+ public FebsResponse seeReturn(QueryRequest request, MemberEntity memberEntity, Integer parentId) {
+ if(parentId==null){
+ ViewController.idFromMember=0;
+ }
+ memberEntity.setId(ViewController.idFromMember);
+ Map<String, Object> dataTable = getDataTable(basicSettingService.seeReturn(request, memberEntity));
+ return new FebsResponse().success().data(dataTable);
+ }
+
+ /**
+ * 会员算力查询---订单详情
+ */
+ @GetMapping("/seeOrder")
+ public FebsResponse seeOrder(QueryRequest request, MemberEntity memberEntity, Integer parentId) {
+ if(parentId==null){
+ ViewController.idFromMember=0;
+ }
+ memberEntity.setId(ViewController.idFromMember);
+ Map<String, Object> dataTable = getDataTable(basicSettingService.seeOrder(request, memberEntity));
+ return new FebsResponse().success().data(dataTable);
+ }
+
+ /**
+ * 合伙人设置--同意
+ * @param id
+ * @return
+ */
+ @GetMapping("addIsTraderOn/{id}")
+ @ControllerEndpoint(operation = "合伙人设置--同意", exceptionMessage = "操作失败")
+ public FebsResponse addIsTraderOn(@NotNull(message = "{required}") @PathVariable Long id) {
+ return basicSettingService.addIsTraderOn(id);
+ }
+ /**
+ * 合伙人设置--取消
+ * @param id
+ * @return
+ */
+ @GetMapping("delIsTraderOn/{id}")
+ @ControllerEndpoint(operation = "合伙人设置--取消", exceptionMessage = "操作失败")
+ public FebsResponse delIsTraderOn(@NotNull(message = "{required}") @PathVariable Long id) {
+ return basicSettingService.delIsTraderOn(id);
+ }
+
+ /**
+ * 产品---更新
+ * @return
+ */
+ @PostMapping("ydProductUpdateOn")
+ @ControllerEndpoint(operation = "产品---更新", exceptionMessage = "设置失败")
+ public FebsResponse ydProductUpdateOn(@Valid YdProductEntity ydProductEntity) {
+ return basicSettingService.ydProductUpdateOn(ydProductEntity);
+ }
+
}
--
Gitblit v1.9.1