From c7c4c4eec809cfd5e399edab50fae9bf68681585 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Tue, 03 Feb 2026 18:32:44 +0800
Subject: [PATCH] 1
---
trading-order-admin/src/main/java/com/yami/trading/admin/controller/c2c/C2cOrderController.java | 72 +++++++++++++++++++++++++++++++++++
1 files changed, 71 insertions(+), 1 deletions(-)
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..45e8b96 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
@@ -4,6 +4,7 @@
import com.yami.trading.admin.controller.c2c.model.*;
import com.yami.trading.bean.c2c.C2cOrder;
import com.yami.trading.bean.model.C2cPaymentMethod;
+import com.yami.trading.bean.model.MoneyLog;
import com.yami.trading.bean.model.User;
import com.yami.trading.common.constants.Constants;
import com.yami.trading.common.domain.Result;
@@ -12,6 +13,7 @@
import com.yami.trading.common.util.StringUtils;
import com.yami.trading.common.util.ThreadUtils;
import com.yami.trading.security.common.util.SecurityUtils;
+import com.yami.trading.service.MoneyLogService;
import com.yami.trading.service.c2c.C2cAdvertService;
import com.yami.trading.service.c2c.C2cOrderService;
import com.yami.trading.service.chat.otc.OtcOnlineChatMessageService;
@@ -25,6 +27,9 @@
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
import java.util.*;
@RestController
@@ -51,6 +56,9 @@
@Autowired
UserService userService;
+
+ @Autowired
+ private MoneyLogService moneyLogService;
//
// private final String action = "normal/adminC2cOrderAction!";
//
@@ -112,7 +120,7 @@
map.put("roleNameDesc", Constants.ROLE_MAP.containsKey(roleName) ? Constants.ROLE_MAP.get(roleName) : roleName);
}
}
- return Result.succeed(page.getRecords());
+ return Result.succeed(page);
}
/**
@@ -171,6 +179,51 @@
}
/**
+ * 取消订单
+ * <p>
+ * remark 取消理由
+ */
+ @PostMapping("updateDate")
+ @ApiOperation("修改日期")
+ public Result updateDate(@RequestBody C2cOrderDateModel model) {
+
+ String createDate = model.getCreateDate();
+ String handDate = model.getHandleTime();
+ String closeDate = model.getCloseDate();
+ String payDate = model.getPayDate();
+ C2cOrder order = c2cOrderService.get(model.getOrderNo());
+ if (null == order) {
+ throw new YamiShopBindException("订单不存在");
+ }
+ // 使用 java.time.LocalDateTime（推荐）
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+ if(org.apache.commons.lang3.StringUtils.isNoneBlank(createDate)){
+ LocalDateTime createTime = LocalDateTime.parse(createDate, formatter);
+ order.setCreateTime(Date.from(createTime.atZone(ZoneId.systemDefault()).toInstant()));
+ MoneyLog moneyLog = moneyLogService.getByLog(model.getOrderNo());
+ moneyLog.setCreateTime(Date.from(createTime.atZone(ZoneId.systemDefault()).toInstant()));
+ moneyLogService.updateById(moneyLog);
+ }
+
+ if(org.apache.commons.lang3.StringUtils.isNoneBlank(handDate)){
+ LocalDateTime handTime = LocalDateTime.parse(handDate, formatter);
+ order.setHandleTime(Date.from(handTime.atZone(ZoneId.systemDefault()).toInstant()));
+ }
+
+ if(org.apache.commons.lang3.StringUtils.isNoneBlank(closeDate)){
+ LocalDateTime closeTime = LocalDateTime.parse(closeDate, formatter);
+ order.setCloseTime(Date.from(closeTime.atZone(ZoneId.systemDefault()).toInstant()));
+ }
+
+ if(org.apache.commons.lang3.StringUtils.isNoneBlank(payDate)){
+ LocalDateTime paycreateTime = LocalDateTime.parse(payDate, formatter);
+ order.setPayTime(Date.from(paycreateTime.atZone(ZoneId.systemDefault()).toInstant()));
+ }
+ this.c2cOrderService.updateById(order);
+ return Result.succeed();
+ }
+
+ /**
* 手动转账
*/
@PostMapping("orderPay")
@@ -215,4 +268,21 @@
return Result.succeed(detail_map);
}
+ /**
+ * 获取 C2C订单 详情
+ */
+ @PostMapping( "update")
+ @ApiOperation("编辑 C2C订单 详情")
+ public Result update(@RequestBody @Valid GetOrderPaymentsModel request) {
+ String order_no =request.getOrder_no();
+ String pay_real_name =request.getPay_real_name();
+ C2cOrder order = this.c2cOrderService.get(order_no);
+ if (null == order) {
+ throw new YamiShopBindException("订单不存在");
+ }
+ order.setPayRealName(pay_real_name);
+ this.c2cOrderService.updateById(order);
+ return Result.succeed();
+ }
+
}
--
Gitblit v1.9.3