From fb5549475c11fa264f4a4630638c136c99250d1e Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 20 May 2021 11:36:40 +0800
Subject: [PATCH] 20210520 订单更新付款人，订单状态，支付时间
---
src/main/java/com/xcong/excoin/modules/otc/controller/OtcController.java | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/otc/controller/OtcController.java b/src/main/java/com/xcong/excoin/modules/otc/controller/OtcController.java
index 57dbe5d..243ed27 100644
--- a/src/main/java/com/xcong/excoin/modules/otc/controller/OtcController.java
+++ b/src/main/java/com/xcong/excoin/modules/otc/controller/OtcController.java
@@ -5,16 +5,17 @@
import com.xcong.excoin.common.entity.FebsResponse;
import com.xcong.excoin.common.entity.QueryRequest;
import com.xcong.excoin.modules.member.entity.MemberAccountMoneyChangeEntity;
+import com.xcong.excoin.modules.member.entity.MemberEntity;
+import com.xcong.excoin.modules.otc.entity.OtcEntrustOrderEntity;
import com.xcong.excoin.modules.otc.entity.OtcMarketBussinessEntity;
import com.xcong.excoin.modules.otc.entity.OtcOrderAppealEntity;
+import com.xcong.excoin.modules.otc.entity.OtcOrderEntity;
import com.xcong.excoin.modules.otc.service.OtcService;
import lombok.RequiredArgsConstructor;
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 org.springframework.web.bind.annotation.*;
+import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import java.util.Map;
@@ -84,4 +85,32 @@
return otcService.dealDone(id);
}
+ /**
+ * 委托单列表
+ */
+ @GetMapping("otcEntrustList")
+ public FebsResponse otcEntrustList(OtcEntrustOrderEntity otcEntrustOrderEntity, QueryRequest request) {
+ Map<String, Object> data = getDataTable(otcService.otcEntrustList(otcEntrustOrderEntity, request));
+ return new FebsResponse().success().data(data);
+ }
+
+ /**
+ * 订单列表
+ */
+ @GetMapping("otcOrderList")
+ public FebsResponse otcOrderList(OtcOrderEntity otcOrderEntity, QueryRequest request) {
+ Map<String, Object> data = getDataTable(otcService.otcOrderList(otcOrderEntity, request));
+ return new FebsResponse().success().data(data);
+ }
+
+ /**
+ *订单列表---付款人
+ * @return
+ */
+ @PostMapping("updateOrderInfo")
+ @ControllerEndpoint(operation = "订单列表---付款人", exceptionMessage = "失败")
+ public FebsResponse updateOrderInfo(@Valid OtcOrderEntity otcOrderEntity) {
+ return otcService.updateOrderInfo(otcOrderEntity);
+ }
+
}
--
Gitblit v1.9.1