From 44b1ab0125f865e68cc5dbdb473ea600b412571d Mon Sep 17 00:00:00 2001
From: zyy3 <zyy3@zy.com>
Date: Sat, 25 Oct 2025 20:12:01 +0800
Subject: [PATCH] C2C
---
trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiBankCardController.java | 42 ++++++++++++++++++++++++++++--------------
1 files changed, 28 insertions(+), 14 deletions(-)
diff --git a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiBankCardController.java b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiBankCardController.java
index b111b53..ea9ba72 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiBankCardController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiBankCardController.java
@@ -83,7 +83,7 @@
String partyId = SecurityUtils.getUser().getUserId();
String session_token = this.sessionTokenService.savePut(partyId);
// Map<String, C2cPaymentMethod> cpmMap = this.c2cPaymentMethodService.getByPartyId("2c948a8282920a9f01829270bcac0000");
- Map<String, C2cPaymentMethod> cpmMap = this.c2cPaymentMethodService.getByPartyId(partyId);
+ /*Map<String, C2cPaymentMethod> cpmMap = this.c2cPaymentMethodService.getByPartyId(partyId);
if (null == cpmMap || 0 == cpmMap.size()) {
// TODO: 2023/4/16
@@ -92,10 +92,10 @@
List<String> cpmList = new ArrayList<String>();
for (String key : cpmMap.keySet()) {
cpmList.add(key);
- }
+ }*/
Map<String, Object> data = new HashMap<String, Object>();
data.put("session_token", session_token);
- data.put("gf_payment_method_id", cpmList.get(0));
+ //data.put("gf_payment_method_id", cpmList.get(0));
return Result.succeed(data);
}
@@ -470,7 +470,7 @@
order.setRemark(remark);
// 用户不能取消提现
if (SecurityUtils.getUser().getUserId().equals(order.getPartyId())) {
- if ("withdraw".equals(order.getDirection())) {
+ if ("sell".equals(order.getDirection())) {
throw new YamiShopBindException("用户不能取消提现");
}
this.c2cOrderService.saveOrderCancel(order, "user");
@@ -488,18 +488,20 @@
if (null == c2cOrder) {
throw new YamiShopBindException("订单不存在");
}
+
List<String> nos = new ArrayList<String>();
nos.add(c2cOrder.getOrderNo());
// TODO: 2023/4/15
-// Map<String, Integer> unreadMsgs =this.otcOnlineChatMessageService.unreadMsgsApi(nos);
-// Integer unreadMsg = unreadMsgs.get(c2cOrder.getOrderNo());
-// if (null == unreadMsg) {
-// c2cOrder.setUnreadMsg(0);
-// } else {
-// c2cOrder.setUnreadMsg(unreadMsg.intValue());
-// }
+ Map<String, Integer> unreadMsgs =this.otcOnlineChatMessageService.unreadMsgsApi(nos);
+ Integer unreadMsg = unreadMsgs.get(c2cOrder.getOrderNo());
+ if (null == unreadMsg) {
+ c2cOrder.setUnreadMsg(0);
+ } else {
+ c2cOrder.setUnreadMsg(unreadMsg);
+ }
if (StringUtils.isNotEmpty(c2cOrder.getMethodImg())) {
- String path = Constants.WEB_URL + "/public/showimg!showImg.action?imagePath=" + c2cOrder.getMethodImg();
+ //String path = Constants.WEB_URL + "/public/showimg!showImg.action?imagePath=" + c2cOrder.getMethodImg();
+ String path = Constants.IMAGES_HTTP + c2cOrder.getMethodImg();
c2cOrder.setMethodImg(path);
}
// 多语言
@@ -507,10 +509,22 @@
long nowTimestamp = (new Date()).getTime();
long createTimestamp = c2cOrder.getCreateTime().getTime();
long autoCancelSeconds = 0;
+ long remainSeconds = 0;
if ("0".equals(c2cOrder.getState())) {
autoCancelSeconds = c2cOrder.getExpireTime() * 60 * 1000 - (nowTimestamp - createTimestamp);
+ remainSeconds = c2cOrder.getExpireTime() * 60 * 1000 * 2 - (nowTimestamp - createTimestamp);
+ } else if ("1".equals(c2cOrder.getState())) {
+ long payTimestamp = c2cOrder.getPayTime().getTime();
+ autoCancelSeconds = c2cOrder.getExpireTime() * 60 * 1000 - (nowTimestamp - createTimestamp);
+ remainSeconds = c2cOrder.getExpireTime() * 60 * 1000 - (nowTimestamp - payTimestamp);
}
+
c2cOrder.setAutoCancelTimeRemain((int) (autoCancelSeconds <= 0 ? 0 : autoCancelSeconds / 1000));
+ c2cOrder.setExpireTimeRemain((int) (remainSeconds <= 0 ? 0 : remainSeconds / 1000));
+
+ if (c2cOrder.getC2cUserHeadImg() != null) {
+ c2cOrder.setC2cUserHeadImg(Constants.IMAGES_HTTP + c2cOrder.getC2cUserHeadImg());
+ }
return Result.succeed(c2cOrder);
}
@@ -559,12 +573,12 @@
throw new YamiShopBindException("页码不能小于等于0");
}
int page_no_int = Integer.valueOf(page_no).intValue();
- if (StringUtils.isNotEmpty(direction) && !Arrays.asList("recharge", "withdraw").contains(direction)) {
+ /*if (StringUtils.isNotEmpty(direction) && !Arrays.asList("recharge", "withdraw").contains(direction)) {
throw new YamiShopBindException("充值或提现不正确");
}
if (StringUtils.isNotEmpty(state) && !Arrays.asList("0", "3", "4").contains(state)) {
throw new YamiShopBindException("订单状态不正确");
- }
+ }*/
Page page = this.c2cOrderService.pagedQuery(page_no_int, 20, direction, state, partyId);
if (null == page) {
return Result.succeed(new ArrayList<Map<String, Object>>());
--
Gitblit v1.9.3