From 640ccb9229224642515527daf87f308a7aa9bdf4 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 10 Jun 2026 11:47:26 +0800
Subject: [PATCH] 1
---
trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiPaymentMethod2Controller.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiPaymentMethod2Controller.java b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiPaymentMethod2Controller.java
index da92f88..a3a1618 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiPaymentMethod2Controller.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiPaymentMethod2Controller.java
@@ -77,7 +77,7 @@
for (C2cPaymentMethod method : map.values()) {
if (null != method) {
if (StringUtils.isNotEmpty(method.getMethodImg())) {
- String path = awsS3OSSFileService.getUrl(method.getMethodImg());
+ String path = Constants.IMAGES_HTTP+method.getMethodImg();
method.setMethodImg(path);
}
list.add(this.c2cTranslateService.translatePm(method, language));
@@ -115,7 +115,7 @@
String id = request.getParameter("id");
List<C2cOrder> order = c2cOrderService.getByPayId(id);
if (ObjectUtils.isNotEmpty(order)) {
- throw new YamiShopBindException("当前支付方式有未处理完成的订单!");
+ throw new YamiShopBindException("Current payment method has pending orders!");
}
this.c2cPaymentMethodService.removeById(id);
return Result.succeed();
@@ -133,11 +133,11 @@
throw new BusinessException("支付方式不存在");
}
if (StringUtils.isNotEmpty(method.getMethodImg())) {
- method.setMethodImg(awsS3OSSFileService.getUrl(method.getMethodImg()));
+ method.setMethodImg(Constants.IMAGES_HTTP+method.getMethodImg());
}
if (StringUtils.isNotEmpty(method.getQrcode())) {
String path = method.getQrcode();
- method.setQrcodePath(awsS3OSSFileService.getUrl(path));
+ method.setQrcodePath(Constants.IMAGES_HTTP+path);
}
return Result.succeed(method);
}
@@ -385,15 +385,15 @@
String id = request.getParameter("id");
String language = request.getParameter("language");
if (StringUtils.isEmptyString(id)) {
- throw new YamiShopBindException("广告id不正确");
+ throw new YamiShopBindException("Invalid advertisement ID");
}
C2cAdvert c2cAdvert = c2cAdvertService.getById(id);
if (null == c2cAdvert) {
- throw new YamiShopBindException("广告不存在");
+ throw new YamiShopBindException("Advertisement does not exist");
}
C2cUser c2cUser = this.c2cUserService.getById(c2cAdvert.getC2cUserId());
if (null == c2cUser) {
- throw new YamiShopBindException("承兑商不存在");
+ throw new YamiShopBindException("Merchant does not exist");
}
List<C2cPaymentMethod> list = new ArrayList<C2cPaymentMethod>();
Map<String, C2cPaymentMethod> map = this.c2cPaymentMethodService.getByPartyId(c2cUser.getC2cUserPartyId());
@@ -405,7 +405,7 @@
}
}
if (null == list || 0 == list.size()) {
- throw new YamiShopBindException("承兑商支付方式未配置");
+ throw new YamiShopBindException("Merchant payment method not configured");
}
String[] payTypes = c2cAdvert.getPayType().split(",");
List<C2cPaymentMethod> resList = new ArrayList<C2cPaymentMethod>();
@@ -419,13 +419,13 @@
}
}
if (null == resList || 0 == resList.size()) {
- throw new YamiShopBindException("承兑商广告支付方式未配置");
+ throw new YamiShopBindException("Merchant advertisement payment method not configured");
}
for (int i = 0; i < resList.size(); i++) {
C2cPaymentMethod method = resList.get(i);
if (null != method) {
if (StringUtils.isNotEmpty(method.getMethodImg())) {
- String path = awsS3OSSFileService.getUrl(method.getMethodImg());
+ String path = Constants.IMAGES_HTTP+method.getMethodImg();
method.setMethodImg(path);
}
}
--
Gitblit v1.9.3