From e79a226068bcf819614d23017441fe1efad3dece Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Fri, 17 Oct 2025 18:23:24 +0800
Subject: [PATCH] C2C
---
trading-order-admin/src/main/java/com/yami/trading/admin/controller/c2c/C2cAppealController.java | 2 +-
trading-order-service/src/main/java/com/yami/trading/service/contract/ContractOrderService.java | 3 +++
trading-order-admin/src/main/java/com/yami/trading/admin/controller/c2c/C2cOrderController.java | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/c2c/C2cAppealController.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/c2c/C2cAppealController.java
index 9460008..029d887 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/c2c/C2cAppealController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/c2c/C2cAppealController.java
@@ -78,7 +78,7 @@
*/
@ApiOperation("已处理")
@PostMapping("handled")
- public Result handled(C2cAppealHandlerModel model) {
+ public Result handled(@RequestBody C2cAppealHandlerModel model) {
C2cOrder order = c2cOrderService.get(model.getOrderNo());
if (null == order) {
throw new YamiShopBindException("订单不存在");
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/c2c/C2cOrderController.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/c2c/C2cOrderController.java
index 3b3ab31..eb6a362 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/c2c/C2cOrderController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/c2c/C2cOrderController.java
@@ -112,7 +112,7 @@
map.put("roleNameDesc", Constants.ROLE_MAP.containsKey(roleName) ? Constants.ROLE_MAP.get(roleName) : roleName);
}
}
- return Result.succeed(page.getRecords());
+ return Result.succeed(page);
}
/**
diff --git a/trading-order-service/src/main/java/com/yami/trading/service/contract/ContractOrderService.java b/trading-order-service/src/main/java/com/yami/trading/service/contract/ContractOrderService.java
index 157f346..02f4f77 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/contract/ContractOrderService.java
+++ b/trading-order-service/src/main/java/com/yami/trading/service/contract/ContractOrderService.java
@@ -300,6 +300,9 @@
* 合约产品平仓后添加当前流水setWithdraw_limit_now_amount
*/
User party = userService.getById(order.getPartyId());
+ if (party.getWithdrawLimitNowAmount() == null) {
+ party.setWithdrawLimitNowAmount(BigDecimal.ZERO);
+ }
party.setWithdrawLimitNowAmount(party.getWithdrawLimitNowAmount().add(order.getDepositOpen()));
userService.updateById(party);
if (ObjectUtils.isEmpty(order.getCloseAvgPrice())) {
--
Gitblit v1.9.3