From 325508eb8d311e07c68cb6c352ffe519459f9edd Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 23 Mar 2021 17:22:37 +0800
Subject: [PATCH] 20210323  后台保留两位小数,(平台数据除外)

---
 src/main/java/com/xcong/excoin/modules/trademanage/controller/TradeManageController.java |  244 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 244 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/trademanage/controller/TradeManageController.java b/src/main/java/com/xcong/excoin/modules/trademanage/controller/TradeManageController.java
index 7f7a733..cb70597 100644
--- a/src/main/java/com/xcong/excoin/modules/trademanage/controller/TradeManageController.java
+++ b/src/main/java/com/xcong/excoin/modules/trademanage/controller/TradeManageController.java
@@ -2,11 +2,15 @@
 
 import java.util.Map;
 
+import javax.validation.constraints.NotNull;
+
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+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;
@@ -26,6 +30,169 @@
 public class TradeManageController extends BaseController{
 	
 	private final TradeManageService tradeManageService;
+
+	/**
+	 * 持仓设置---列表
+	 */
+	@GetMapping("positionSetting")
+	public FebsResponse getPositionSettingList(MemberEntity memberEntity, QueryRequest request) {
+		Map<String, Object> data = getDataTable(tradeManageService.getPositionSettingList(memberEntity, request));
+		return new FebsResponse().success().data(data);
+	}
+	
+	 /**
+     * 持仓设置---禁止
+     * @param id
+     * @return
+     */
+    @GetMapping("disagreePositionSetting/{id}")
+    @ControllerEndpoint(operation = "持仓设置---禁止", exceptionMessage = "禁止失败")
+    public FebsResponse disagreePositionSetting(@NotNull(message = "{required}") @PathVariable Long id) {
+        return tradeManageService.disagreePositionSetting(id);
+    }
+    
+    /**
+     * 持仓设置---开启
+     * @param id
+     * @return
+     */
+    @GetMapping("agreePositionSetting/{id}")
+    @ControllerEndpoint(operation = "持仓设置---开启", exceptionMessage = "开启失败")
+    public FebsResponse agreePositionSetting(@NotNull(message = "{required}") @PathVariable Long id) {
+        return tradeManageService.agreePositionSetting(id);
+    }
+	
+	/**
+     * 历史委托明细---列表---17773261001
+     */
+    @GetMapping("historyOrderInfoAloneOne")
+    public FebsResponse historyOrderInfoAloneOne(ContractOrderEntity contractOrderEntity, QueryRequest request) {
+    	Map<String, Object> data = getDataTable(tradeManageService.findHistoryOrderInfoAloneOneInPage(contractOrderEntity, request));
+    	return new FebsResponse().success().data(data);
+    }
+    /**
+     * 历史委托明细---列表---17773261002
+     */
+    @GetMapping("historyOrderInfoAloneTwo")
+    public FebsResponse historyOrderInfoAloneTwo(ContractOrderEntity contractOrderEntity, QueryRequest request) {
+    	Map<String, Object> data = getDataTable(tradeManageService.findHistoryOrderInfoAloneTwoInPage(contractOrderEntity, request));
+    	return new FebsResponse().success().data(data);
+    }
+    /**
+     * 历史委托明细---列表---17773261003
+     */
+    @GetMapping("historyOrderInfoAloneTee")
+    public FebsResponse historyOrderInfoAloneTee(ContractOrderEntity contractOrderEntity, QueryRequest request) {
+    	Map<String, Object> data = getDataTable(tradeManageService.findHistoryOrderInfoAloneTeeInPage(contractOrderEntity, request));
+    	return new FebsResponse().success().data(data);
+    }
+    /**
+     * 历史委托明细---列表---17773260001
+     */
+    @GetMapping("historyOrderInfoAloneAll")
+    public FebsResponse historyOrderInfoAloneAll(ContractOrderEntity contractOrderEntity, QueryRequest request) {
+    	Map<String, Object> data = getDataTable(tradeManageService.findHistoryOrderInfoAloneAllInPage(contractOrderEntity, request));
+    	return new FebsResponse().success().data(data);
+    }
+	
+	/**
+     * 账户信息---列表---17773261001
+     */
+    @GetMapping("memberAccountInfoAloneOne")
+    public FebsResponse memberAccountInfoAloneOne(MemberEntity memberEntity, QueryRequest request) {
+    	Map<String, Object> data = getDataTable(tradeManageService.findMemberAccountInfoAloneOneInPage(memberEntity, request));
+    	return new FebsResponse().success().data(data);
+    }
+    /**
+     * 账户信息---列表---17773261002
+     */
+    @GetMapping("memberAccountInfoAloneTwo")
+    public FebsResponse memberAccountInfoAloneTwo(MemberEntity memberEntity, QueryRequest request) {
+    	Map<String, Object> data = getDataTable(tradeManageService.findMemberAccountInfoAloneTwoInPage(memberEntity, request));
+    	return new FebsResponse().success().data(data);
+    }
+    /**
+     * 账户信息---列表---17773261003
+     */
+    @GetMapping("memberAccountInfoAloneTee")
+    public FebsResponse memberAccountInfoAloneTee(MemberEntity memberEntity, QueryRequest request) {
+    	Map<String, Object> data = getDataTable(tradeManageService.findMemberAccountInfoAloneTeeInPage(memberEntity, request));
+    	return new FebsResponse().success().data(data);
+    }
+    /**
+     * 账户信息---列表---17773260001
+     */
+    @GetMapping("memberAccountInfoAloneAll")
+    public FebsResponse memberAccountInfoAloneAll(MemberEntity memberEntity, QueryRequest request) {
+    	Map<String, Object> data = getDataTable(tradeManageService.findMemberAccountInfoAloneAllInPage(memberEntity, request));
+    	return new FebsResponse().success().data(data);
+    }
+	
+	/**
+	 * 返佣明细---列表---17773261001
+	 */
+	@GetMapping("memberAgentReturnInfoAloneOne")
+	public FebsResponse memberAgentReturnInfoAloneOne(MemberAccountMoneyChangeEntity memberAccountMoneyChangeEntity, QueryRequest request) {
+		Map<String, Object> data = getDataTable(tradeManageService.findMemberAgentReturnInfoAloneOneInPage(memberAccountMoneyChangeEntity, request));
+		return new FebsResponse().success().data(data);
+	}
+	/**
+	 * 返佣明细---列表---17773261002
+	 */
+	@GetMapping("memberAgentReturnInfoAloneTwo")
+	public FebsResponse memberAgentReturnInfoAloneTwo(MemberAccountMoneyChangeEntity memberAccountMoneyChangeEntity, QueryRequest request) {
+		Map<String, Object> data = getDataTable(tradeManageService.findMemberAgentReturnInfoAloneTwoInPage(memberAccountMoneyChangeEntity, request));
+		return new FebsResponse().success().data(data);
+	}
+	/**
+	 * 返佣明细---列表---17773261003
+	 */
+	@GetMapping("memberAgentReturnInfoAloneThree")
+	public FebsResponse memberAgentReturnInfoAloneThree(MemberAccountMoneyChangeEntity memberAccountMoneyChangeEntity, QueryRequest request) {
+		Map<String, Object> data = getDataTable(tradeManageService.findMemberAgentReturnInfoAloneThreeInPage(memberAccountMoneyChangeEntity, request));
+		return new FebsResponse().success().data(data);
+	}
+	/**
+	 * 返佣明细---列表---17773260001
+	 */
+	@GetMapping("memberAgentReturnInfoAloneOneAll")
+	public FebsResponse memberAgentReturnInfoAloneOneAll(MemberAccountMoneyChangeEntity memberAccountMoneyChangeEntity, QueryRequest request) {
+		Map<String, Object> data = getDataTable(tradeManageService.findMemberAgentReturnInfoAloneOneAllInPage(memberAccountMoneyChangeEntity, request));
+		return new FebsResponse().success().data(data);
+	}
+	
+	/**
+	 * 当前持仓---列表---17773261001
+	 */
+	@GetMapping("contractHoldOrderAloneOne")
+	public FebsResponse contractHoldOrderAloneOne(ContractHoldOrderEntity contractHoldOrderEntity, QueryRequest request) {
+		Map<String, Object> data = getDataTable(tradeManageService.findContractHoldOrderAloneOneInPage(contractHoldOrderEntity, request));
+		return new FebsResponse().success().data(data);
+	}
+	/**
+	 * 当前持仓---列表---17773261002
+	 */
+	@GetMapping("contractHoldOrderAloneTwo")
+	public FebsResponse contractHoldOrderAloneTwo(ContractHoldOrderEntity contractHoldOrderEntity, QueryRequest request) {
+		Map<String, Object> data = getDataTable(tradeManageService.findContractHoldOrderAloneTwoInPage(contractHoldOrderEntity, request));
+		return new FebsResponse().success().data(data);
+	}
+	/**
+	 * 当前持仓---列表---17773261003
+	 */
+	@GetMapping("contractHoldOrderAloneThree")
+	public FebsResponse contractHoldOrderAloneThree(ContractHoldOrderEntity contractHoldOrderEntity, QueryRequest request) {
+		Map<String, Object> data = getDataTable(tradeManageService.findContractHoldOrderAloneThreeInPage(contractHoldOrderEntity, request));
+		return new FebsResponse().success().data(data);
+	}
+	/**
+	 * 当前持仓---列表---17773260001
+	 */
+	@GetMapping("contractHoldOrderAloneOneAll")
+	public FebsResponse contractHoldOrderAloneOneAll(ContractHoldOrderEntity contractHoldOrderEntity, QueryRequest request) {
+		Map<String, Object> data = getDataTable(tradeManageService.findContractHoldOrderAloneOneAllInPage(contractHoldOrderEntity, request));
+		return new FebsResponse().success().data(data);
+	}
 	
 	/**
 	 * 当前持仓---列表
@@ -34,6 +201,22 @@
 	public FebsResponse getList(ContractHoldOrderEntity contractHoldOrderEntity, QueryRequest request) {
 	    Map<String, Object> data = getDataTable(tradeManageService.findContractHoldOrderListInPage(contractHoldOrderEntity, request));
 	    return new FebsResponse().success().data(data);
+	}
+	/**
+	 * 当前持仓---列表alone
+	 */
+	@GetMapping("contractHoldOrderAlone")
+	public FebsResponse contractHoldOrderAlone(ContractHoldOrderEntity contractHoldOrderEntity, QueryRequest request) {
+		Map<String, Object> data = getDataTable(tradeManageService.findContractHoldOrderAloneInPage(contractHoldOrderEntity, request));
+		return new FebsResponse().success().data(data);
+	}
+	/**
+	 * 当前持仓---列表Test
+	 */
+	@GetMapping("contractHoldOrderAloneTest")
+	public FebsResponse contractHoldOrderAloneTest(ContractHoldOrderEntity contractHoldOrderEntity, QueryRequest request) {
+		Map<String, Object> data = getDataTable(tradeManageService.findContractHoldOrderAloneTestInPage(contractHoldOrderEntity, request));
+		return new FebsResponse().success().data(data);
 	}
 	
 	/**
@@ -46,12 +229,48 @@
     }
     
     /**
+     * 账户信息---列表alone
+     */
+    @GetMapping("memberAccountInfoAlone")
+    public FebsResponse memberAccountInfoAlone(MemberEntity memberEntity, QueryRequest request) {
+    	Map<String, Object> data = getDataTable(tradeManageService.findmemberAccountInfoAloneListInPage(memberEntity, request));
+    	return new FebsResponse().success().data(data);
+    }
+    
+    /**
+     * 账户信息---列表Test
+     */
+    @GetMapping("memberAccountInfoAloneTest")
+    public FebsResponse memberAccountInfoAloneTest(MemberEntity memberEntity, QueryRequest request) {
+    	Map<String, Object> data = getDataTable(tradeManageService.findmemberAccountInfoAloneTestListInPage(memberEntity, request));
+    	return new FebsResponse().success().data(data);
+    }
+    
+    /**
      * 返佣明细---列表
      */
     @GetMapping("memberAgentReturnInfo")
     public FebsResponse memberAgentReturnInfo(MemberAccountMoneyChangeEntity memberAccountMoneyChangeEntity, QueryRequest request) {
         Map<String, Object> data = getDataTable(tradeManageService.findMemberAgentReturnInfoInPage(memberAccountMoneyChangeEntity, request));
         return new FebsResponse().success().data(data);
+    }
+    
+    /**
+     * 返佣明细---alone
+     */
+    @GetMapping("memberAgentReturnInfoAlone")
+    public FebsResponse memberAgentReturnInfoAlone(MemberAccountMoneyChangeEntity memberAccountMoneyChangeEntity, QueryRequest request) {
+        Map<String, Object> data = getDataTable(tradeManageService.findMemberAgentReturnInfoAloneInPage(memberAccountMoneyChangeEntity, request));
+        return new FebsResponse().success().data(data);
+    }
+    
+    /**
+     * 返佣明细---Test
+     */
+    @GetMapping("memberAgentReturnInfoAloneTest")
+    public FebsResponse memberAgentReturnInfoAloneTest(MemberAccountMoneyChangeEntity memberAccountMoneyChangeEntity, QueryRequest request) {
+    	Map<String, Object> data = getDataTable(tradeManageService.findMemberAgentReturnInfoAloneTestInPage(memberAccountMoneyChangeEntity, request));
+    	return new FebsResponse().success().data(data);
     }
     
     /**
@@ -72,5 +291,30 @@
     	return new FebsResponse().success().data(data);
     }
     
+    /**
+     * 全部历史委托明细---列表
+     */
+    @GetMapping("historyOrderInfoAll")
+    public FebsResponse historyOrderInfoAll(ContractOrderEntity contractOrderEntity, QueryRequest request) {
+    	Map<String, Object> data = getDataTable(tradeManageService.findMemberHistoryOrderAllInfoInPage(contractOrderEntity, request));
+    	return new FebsResponse().success().data(data);
+    }
+    /**
+     * 历史委托明细---alone
+     */
+    @GetMapping("historyOrderInfoAlone")
+    public FebsResponse historyOrderInfoAlone(ContractOrderEntity contractOrderEntity, QueryRequest request) {
+    	Map<String, Object> data = getDataTable(tradeManageService.findHistoryOrderInfoAloneInfoInPage(contractOrderEntity, request));
+    	return new FebsResponse().success().data(data);
+    }
+    /**
+     * 历史委托明细---Test
+     */
+    @GetMapping("historyOrderInfoAloneTest")
+    public FebsResponse historyOrderInfoAloneTest(ContractOrderEntity contractOrderEntity, QueryRequest request) {
+    	Map<String, Object> data = getDataTable(tradeManageService.findhistoryOrderInfoAloneTestInfoInPage(contractOrderEntity, request));
+    	return new FebsResponse().success().data(data);
+    }
+    
 
 }

--
Gitblit v1.9.1