From 0830a387f0c28c2d448714ad184fd0c17bf27ea9 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 25 May 2021 10:30:50 +0800
Subject: [PATCH] 20210525 回款

---
 src/main/java/com/xcong/excoin/modules/otc/controller/OtcController.java |   76 ++++++++++++++++++++++++++++++++++++--
 1 files changed, 72 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 3050bdc..7892228 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,15 +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;
 
@@ -54,5 +56,71 @@
         return otcService.disagreeShop(id);
     }
 
+    /**
+     * 订单申诉列表
+     */
+    @GetMapping("otcAppealList")
+    public FebsResponse otcAppealList(OtcOrderAppealEntity otcOrderAppealEntity, QueryRequest request) {
+        Map<String, Object> data = getDataTable(otcService.otcAppealList(otcOrderAppealEntity, request));
+        return new FebsResponse().success().data(data);
+    }
+
+    /**
+     * 申诉---处理中
+     * @return
+     */
+    @GetMapping("dealIng/{id}")
+    @ControllerEndpoint(operation = "申诉---处理中", exceptionMessage = "失败")
+    public FebsResponse dealIng(@NotNull(message = "{required}") @PathVariable Long id) {
+        return otcService.dealIng(id);
+    }
+
+    /**
+     * 申诉---处理完
+     * @return
+     */
+    @GetMapping("dealDone/{id}")
+    @ControllerEndpoint(operation = "申诉---处理完", exceptionMessage = "失败")
+    public FebsResponse dealDone(@NotNull(message = "{required}") @PathVariable Long id) {
+        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);
+    }
+
+    /**
+     *回款
+     * @return
+     */
+    @PostMapping("otcHuiKuan")
+    @ControllerEndpoint(operation = "订单列表---付款人", exceptionMessage = "失败")
+    public FebsResponse otcHuiKuan(@Valid OtcMarketBussinessEntity otcMarketBussinessEntity) {
+        return otcService.otcHuiKuan(otcMarketBussinessEntity);
+    }
 
 }

--
Gitblit v1.9.1