fix redirectUrl issue

huanggang
1 parent 1e1c5f65
Showing 11 changed files with 78 additions and 65 deletions
cashier-boss/src/main/java/com/diligrp/cashier/boss/controller/CashierDeskController.java
cashier-boss/src/main/java/com/diligrp/cashier/boss/domain/CashierOrderVO.java
cashier-boss/src/main/java/com/diligrp/cashier/boss/service/impl/CashierDeskManager.java
cashier-boss/src/main/java/com/diligrp/cashier/boss/service/impl/CashierDeskServiceImpl.java
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/client/CardPaymentHttpClient.java
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/client/RcbOnlineHttpClient.java
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/client/WechatDirectHttpClient.java
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/client/WechatHttpClient.java
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/client/WechatPartnerHttpClient.java
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/domain/card/UserCardDTO.java
cashier-trade/src/main/java/com/diligrp/cashier/trade/service/impl/TradeAssistantServiceImpl.java
@@ -35,7 +35,6 @@ public class CashierDeskController {
         AssertUtils.notNull(request.getAmount(), "amount missed");
         AssertUtils.isTrue(request.getAmount() > 0, "Invalid amount");
         AssertUtils.notEmpty(request.getOutTradeNo(), "outTradeNo missed");
-        AssertUtils.notEmpty(request.getRedirectUrl(), "redirectUrl missed");
         CashierOrder cashierOrder = CashierOrderConverter.INSTANCE.convert(request);
         Merchant merchant = merchantService.loadCashierMerchant(request.getMchId());
@@ -5,6 +5,10 @@ import com.diligrp.cashier.pipeline.type.ChannelType;
 import java.util.List;
 public class CashierOrderVO {
+    // 商户号
+    private final Long mchId;
+    // 商户名称
+    private final String mchName;
     // 交易号
     private final String tradeId;
     // 业务系统用户标识
@@ -18,8 +22,10 @@ public class CashierOrderVO {
     // 支付通道
     private final List<PaymentPipeline> pipelines;
-    public CashierOrderVO(String tradeId, String userId, String goods, Long amount,
+    public CashierOrderVO(Long mchId, String mchName, String tradeId, String userId, String goods, Long amount,
                           String redirectUrl, List<PaymentPipeline> pipelines) {
+        this.mchId = mchId;
+        this.mchName = mchName;
         this.tradeId = tradeId;
         this.userId = userId;
         this.goods = goods;
@@ -28,6 +34,14 @@ public class CashierOrderVO {
         this.pipelines = pipelines;
     }
+    public Long getMchId() {
+        return mchId;
+    }
+
+    public String getMchName() {
+        return mchName;
+    }
+
     public String getTradeId() {
         return tradeId;
     }
@@ -37,7 +37,6 @@ public class CashierDeskManager implements ICashierDeskManager {
         AssertUtils.notNull(request.getAmount(), "amount missed");
         AssertUtils.isTrue(request.getAmount() > 0, "Invalid amount");
         AssertUtils.notEmpty(request.getOutTradeNo(), "outTradeNo missed");
-        AssertUtils.notEmpty(request.getRedirectUrl(), "redirectUrl missed");
         CashierOrder cashierOrder = CashierOrderConverter2.INSTANCE.convert(request);
         Merchant merchant = merchantService.loadCashierMerchant(request.getMchId());
@@ -7,6 +7,7 @@ import com.diligrp.cashier.boss.domain.CashierOrderVO;
 import com.diligrp.cashier.boss.domain.CashierPaymentUrl;
 import com.diligrp.cashier.boss.exception.BossServiceException;
 import com.diligrp.cashier.boss.service.ICashierDeskService;
+import com.diligrp.cashier.boss.service.IMerchantService;
 import com.diligrp.cashier.pipeline.core.PaymentPipeline;
 import com.diligrp.cashier.pipeline.domain.OnlinePaymentStatus;
 import com.diligrp.cashier.pipeline.service.IPaymentPipelineManager;
@@ -35,6 +36,9 @@ public class CashierDeskServiceImpl implements ICashierDeskService {
     private ITradeAssistantService tradeAssistantService;
     @Resource
+    private IMerchantService merchantService;
+
+    @Resource
     private IPaymentPipelineManager paymentPipelineManager;
     @Resource
@@ -83,11 +87,12 @@ public class CashierDeskServiceImpl implements ICashierDeskService {
         if (TradeState.isFinished(trade.getState())) {
             throw new BossServiceException(ErrorCode.ILLEGAL_ARGUMENT_ERROR, "收银台订单已完成，不能进行支付");
         }
+        Merchant merchant = merchantService.loadCashierMerchant(trade.getMchId());
         List<PaymentPipeline> pipelines = paymentPipelineManager.listPipelines(orderToken.getMchId(), PaymentPipeline.class);
         List<CashierOrderVO.PaymentPipeline> pipelineList = pipelines.stream().map(pipeline ->
             new CashierOrderVO.PaymentPipeline(pipeline.pipelineId(), pipeline.supportedChannel())).toList();
-        return new CashierOrderVO(orderToken.getTradeId(), orderToken.getUserId(), trade.getGoods(), trade.getMaxAmount(),
-            orderToken.getRedirectUrl(), pipelineList);
+        return new CashierOrderVO(merchant.getMchId(), merchant.getName(), orderToken.getTradeId(), orderToken.getUserId(),
+            trade.getGoods(), trade.getMaxAmount(), orderToken.getRedirectUrl(), pipelineList);
     }
     /**
@@ -11,7 +11,6 @@ import com.diligrp.cashier.pipeline.type.PaymentState;
 import com.diligrp.cashier.shared.ErrorCode;
 import com.diligrp.cashier.shared.service.ServiceEndpointSupport;
 import com.diligrp.cashier.shared.type.SourceType;
-import com.diligrp.cashier.shared.util.CurrencyUtils;
 import com.diligrp.cashier.shared.util.JsonUtils;
 import com.fasterxml.jackson.core.type.TypeReference;
 import org.slf4j.Logger;
@@ -65,11 +64,11 @@ public class CardPaymentHttpClient extends ServiceEndpointSupport {
         }
         String payload = JsonUtils.toJsonString(params);
-        LOG.debug("Sending card payment request: {}", payload);
+        LOG.info("Sending card payment request: {}\n{}", request.getPaymentId(), payload);
         LocalDateTime now = LocalDateTime.now();
         HttpResult result = send(uri, payload);
         if (result.statusCode == 200) {
-            LOG.debug("Received from card payment pipeline: {}", result.responseText);
+            LOG.debug("Received from card payment pipeline: {}\n{}", request.getPaymentId(), result.responseText);
             Map<String, Object> response = JsonUtils.fromJsonString(result.responseText, new TypeReference<>() {});
             if ("200".equals(response.get("code"))) {
                 Map<String, Object> data = (Map<String, Object>) response.get("data");
@@ -80,7 +79,7 @@ public class CardPaymentHttpClient extends ServiceEndpointSupport {
                 payerId.put("cardNo", data.get("cardNo"));
                 payerId.put("name", data.get("customerName"));
                 return new CardPaymentResponse(request.getPaymentId(), outTradeNo, OutPaymentType.DILICARD,
-                        JsonUtils.toJsonString(payerId), now, PaymentState.SUCCESS, "园区卡支付成功");
+                    JsonUtils.toJsonString(payerId), now, PaymentState.SUCCESS, "园区卡支付成功");
             } else {
                 throw new PaymentPipelineException(ErrorCode.SERVICE_ACCESS_ERROR, "园区卡支付失败: " + response.get("message"));
             }
@@ -96,11 +95,11 @@ public class CardPaymentHttpClient extends ServiceEndpointSupport {
         params.put("amount", request.getAmount());
         String payload = JsonUtils.toJsonString(params);
-        LOG.debug("Sending card refund request: {}", payload);
+        LOG.info("Sending card refund request: {}\n{}", request.getRefundId(), payload);
         LocalDateTime now = LocalDateTime.now();
         HttpResult result = send(uri, payload);
         if (result.statusCode == 200) {
-            LOG.debug("Received from card payment pipeline: {}", result.responseText);
+            LOG.debug("Received from card payment pipeline: {}\n", request.getRefundId(), result.responseText);
             Map<String, Object> response = JsonUtils.fromJsonString(result.responseText, new TypeReference<>() {});
             if ("200".equals(response.get("code"))) {
                 return new OnlineRefundResponse(request.getRefundId(), null, now,
@@ -119,10 +118,10 @@ public class CardPaymentHttpClient extends ServiceEndpointSupport {
         params.put("customerId", Long.parseLong(userId));
         String payload = JsonUtils.toJsonString(params);
-        LOG.debug("Sending list user card request: {}", payload);
+        LOG.debug("Sending list user card request: {}\n{}", userId, payload);
         HttpResult result = send(uri, payload);
         if (result.statusCode == 200) {
-            LOG.debug("Received from card payment pipeline: {}", result.responseText);
+            LOG.debug("Received from card payment pipeline: {}\n{}", userId, result.responseText);
             Map<String, Object> response = JsonUtils.fromJsonString(result.responseText, new TypeReference<>() {});
             if ("200".equals(response.get("code"))) {
                 List<UserCardDTO> userCards = new ArrayList<>();
@@ -130,10 +129,9 @@ public class CardPaymentHttpClient extends ServiceEndpointSupport {
                 if (data != null) {
                     List<Map<String, Object>> cardList = JsonUtils.convertValue(data, new TypeReference<>() {});
                     for (Map<String, Object> card : cardList) {
-                        String amount = CurrencyUtils.toNoSymbolCurrency(convertLong(card.get("amount")));
                         UserCardDTO userCard = new UserCardDTO(convertLong(card.get("customerId")),
                             convertLong(card.get("accountId")), (String) card.get("cardNo"),
-                            (String) card.get("customerName"), amount);
+                            (String) card.get("customerName"), convertLong(card.get("amount")));
                         userCards.add(userCard);
                     }
                 }
@@ -9,10 +9,7 @@
  import com.diligrp.cashier.shared.ErrorCode;
  import com.diligrp.cashier.shared.exception.ServiceAccessException;
  import com.diligrp.cashier.shared.service.ServiceEndpointSupport;
- import com.diligrp.cashier.shared.util.DateUtils;
- import com.diligrp.cashier.shared.util.JsonUtils;
- import com.diligrp.cashier.shared.util.ObjectUtils;
- import com.diligrp.cashier.shared.util.RandomUtils;
+ import com.diligrp.cashier.shared.util.*;
  import com.fasterxml.jackson.core.type.TypeReference;
  import jakarta.annotation.Resource;
  import org.slf4j.Logger;
@@ -58,8 +55,7 @@ public class RcbOnlineHttpClient extends ServiceEndpointSupport {
     private final String appId;
-     @Resource
-    private StringRedisTemplate stringRedisTemplate;
+    private final StringRedisTemplate stringRedisTemplate;
     public RcbOnlineHttpClient(String uri, String merchantNo, String terminalNo, String key, String appId) {
         this.uri = uri;
@@ -67,6 +63,7 @@ public class RcbOnlineHttpClient extends ServiceEndpointSupport {
         this.terminalNo = terminalNo;
         this.key = key;
         this.appId = appId;
+        this.stringRedisTemplate = SpringContextUtils.getBean(StringRedisTemplate.class);
     }
      public String sendMiniProPrepayRequest(MiniProPrepayRequest request, String notifyUrl) {
@@ -86,13 +83,13 @@ public class RcbOnlineHttpClient extends ServiceEndpointSupport {
          params.put("sign", RcbSignatureUtils.sign(params, key));
          String payload = JsonUtils.toJsonString(params);
-         LOG.debug("Sending rcb minipro prepay request: {}", payload);
+         LOG.info("Sending rcb minipro prepay request: {}\n{}", request.getPaymentId(), payload);
          HttpResult result = send(uri + "/cposp/pay/unifiedorder", payload);
          if (result.statusCode != STATUS_OK) {
              LOG.error("Failed to send rcb minipro prepay, statusCode: {}", result.statusCode);
              throw new PaymentPipelineException(ErrorCode.SYSTEM_UNKNOWN_ERROR, "调用小程序预支付接口失败: " + result.statusCode);
          }
-         LOG.debug("Received rcb mini pro prepay response: {}", result.responseText);
+         LOG.debug("Received rcb minipro prepay response: {}", result.responseText);
          Map<String, String> data = JsonUtils.fromJsonString(result.responseText, new TypeReference<>() {});
          String resultCode = data.get("resultCode");
@@ -63,7 +63,7 @@ public class WechatDirectHttpClient extends WechatHttpClient {
         headers[1] = HttpHeader.create(WechatConstants.HEADER_ACCEPT, WechatConstants.ACCEPT_JSON);
         headers[2] = HttpHeader.create(WechatConstants.HEADER_AUTHORIZATION, authorization);
-        LOG.info("Sending wechat native prepay request...");
+        LOG.info("Sending wechat native prepay request: {}", request.getPaymentId());
         LOG.debug("Authorization: {}\n{}", authorization, payload);
         HttpResult result = send(wechatBaseUri + NATIVE_PREPAY, headers, payload);
         verifyHttpResult(result);
@@ -71,7 +71,7 @@ public class WechatDirectHttpClient extends WechatHttpClient {
             Map<String, Object> response = JsonUtils.fromJsonString(result.responseText, new TypeReference<>() {});
             return NativePrepayResponse.of(request.getPaymentId(), (String) response.get("code_url"));
         } else {
-            LOG.error("Wechat native prepay failed: {}\n{}", result.statusCode, result.responseText);
+            LOG.error("Failed to send wechat native prepay request: {}\n{}", request.getPaymentId(), result.responseText);
             ErrorMessage message = JsonUtils.fromJsonString(result.responseText, ErrorMessage.class);
             throw new PaymentPipelineException(ErrorCode.SYSTEM_UNKNOWN_ERROR, "发起微信预支付失败: " + message.getMessage());
         }
@@ -91,7 +91,7 @@ public class WechatDirectHttpClient extends WechatHttpClient {
         headers[1] = HttpHeader.create(WechatConstants.HEADER_ACCEPT, WechatConstants.ACCEPT_JSON);
         headers[2] = HttpHeader.create(WechatConstants.HEADER_AUTHORIZATION, authorization);
-        LOG.info("Sending wechat jsapi prepay request...");
+        LOG.info("Sending wechat jsapi prepay request: {}", request.getPaymentId());
         LOG.debug("Authorization: {}\n{}", authorization, payload);
         HttpResult result = send(wechatBaseUri + JSAPI_PREPAY, headers, payload);
         verifyHttpResult(result);
@@ -99,7 +99,7 @@ public class WechatDirectHttpClient extends WechatHttpClient {
             Map<String, Object> response = JsonUtils.fromJsonString(result.responseText, new TypeReference<>() {});
             return (String) response.get("prepay_id");
         } else {
-            LOG.error("Wechat jsapi prepay failed: {}\n{}", result.statusCode, result.responseText);
+            LOG.error("Failed to send wechat jsapi prepay request: {}\n{}", request.getPaymentId(), result.responseText);
             ErrorMessage message = JsonUtils.fromJsonString(result.responseText, ErrorMessage.class);
             throw new PaymentPipelineException(ErrorCode.SYSTEM_UNKNOWN_ERROR, "发起微信预支付失败: " + message.getMessage());
         }
@@ -109,9 +109,9 @@ public class WechatDirectHttpClient extends WechatHttpClient {
      * 查询微信预支付订单状态
      */
     @Override
-    public OnlinePaymentResponse queryPrepayResponse(OnlinePrepayOrder order) throws Exception {
+    public OnlinePaymentResponse queryPrepayResponse(OnlinePrepayOrder request) throws Exception {
         // 获取认证信息和签名信息
-        String uri = String.format(TRANSACTION_QUERY, order.getPaymentId(), wechatConfig.getMchId());
+        String uri = String.format(TRANSACTION_QUERY, request.getPaymentId(), wechatConfig.getMchId());
         String authorization = WechatSignatureUtils.authorization(wechatConfig.getMchId(), WechatConstants.HTTP_GET, uri,
             wechatConfig.getPrivateKey(), wechatConfig.getSerialNo());
@@ -120,7 +120,7 @@ public class WechatDirectHttpClient extends WechatHttpClient {
             .header(CONTENT_TYPE, CONTENT_TYPE_JSON).header(WechatConstants.HEADER_AUTHORIZATION, authorization)
             .header(WechatConstants.HEADER_ACCEPT, WechatConstants.ACCEPT_JSON)
             .header(WechatConstants.HEADER_USER_AGENT, WechatConstants.USER_AGENT);
-        LOG.info("Sending wechat query merchant order request...");
+        LOG.info("Sending wechat query prepay order state request: {}", request.getPaymentId());
         LOG.debug("Authorization: {}\n", authorization);
         HttpResult result = execute(httpRequest.GET().build());
         verifyHttpResult(result);
@@ -134,7 +134,7 @@ public class WechatDirectHttpClient extends WechatHttpClient {
             return new OnlinePaymentResponse((String) response.get("out_trade_no"), (String) response.get("transaction_id"),
                 OutPaymentType.WXPAY, openId, when, state, (String) response.get("trade_state_desc"));
         } else {
-            LOG.info("Wechat query transaction status failed: {}", result.statusCode);
+            LOG.error("Failed to query wechat prepay order state: {}\n{}", request.getPaymentId(), result.responseText);
             ErrorMessage message = JsonUtils.fromJsonString(result.responseText, ErrorMessage.class);
             throw new PaymentPipelineException(ErrorCode.SYSTEM_UNKNOWN_ERROR, "发起微信订单查询失败: " + message.getMessage());
         }
@@ -159,12 +159,12 @@ public class WechatDirectHttpClient extends WechatHttpClient {
         headers[0] = HttpHeader.create(WechatConstants.HEADER_USER_AGENT, WechatConstants.USER_AGENT);
         headers[1] = HttpHeader.create(WechatConstants.HEADER_ACCEPT, WechatConstants.ACCEPT_JSON);
         headers[2] = HttpHeader.create(WechatConstants.HEADER_AUTHORIZATION, authorization);
-        LOG.info("Sending close wechat prepay order request...");
+        LOG.info("Sending close wechat prepay order request: {}", request.getPaymentId());
         LOG.debug("Authorization: {}\n{}", authorization, payload);
         HttpResult result = send(wechatBaseUri + uri, headers, payload);
         verifyHttpResult(result);
-        LOG.info("Close wechat prepay order statusCode: {}", result.statusCode);
         if (result.statusCode != 200 && result.statusCode != 204) {
+            LOG.error("Failed to close wechat prepay order: {}\n{}", request.getPaymentId(), result.responseText);
             ErrorMessage message = JsonUtils.fromJsonString(result.responseText, ErrorMessage.class);
             throw new PaymentPipelineException(ErrorCode.INVALID_OBJECT_STATE, "关闭微信订单失败: " + message.getMessage());
         }
@@ -184,7 +184,7 @@ public class WechatDirectHttpClient extends WechatHttpClient {
         headers[1] = HttpHeader.create(WechatConstants.HEADER_ACCEPT, WechatConstants.ACCEPT_JSON);
         headers[2] = HttpHeader.create(WechatConstants.HEADER_AUTHORIZATION, authorization);
-        LOG.info("Sending wechat payment refund request...");
+        LOG.info("Sending wechat payment refund request: {}", request.getPaymentId());
         LOG.debug("Authorization: {}\n{}", authorization, payload);
         HttpResult result = send(wechatBaseUri + TRANSACTION_REFUND, headers, payload);
         verifyHttpResult(result);
@@ -195,7 +195,7 @@ public class WechatDirectHttpClient extends WechatHttpClient {
             return new OnlineRefundResponse((String) response.get("out_refund_no"), (String) response.get("refund_id"),
                 when, state, (String) response.get("status"));
         } else {
-            LOG.info("send wechat refund failed: {}", result.statusCode);
+            LOG.error("Failed to send wechat refund request: {}\n{}", request.getPaymentId(), result.responseText);
             ErrorMessage message = JsonUtils.fromJsonString(result.responseText, ErrorMessage.class);
             throw new PaymentPipelineException(ErrorCode.SYSTEM_UNKNOWN_ERROR, "发起微信退款失败: " + message.getMessage());
         }
@@ -215,7 +215,7 @@ public class WechatDirectHttpClient extends WechatHttpClient {
             .header(CONTENT_TYPE, CONTENT_TYPE_JSON).header(WechatConstants.HEADER_AUTHORIZATION, authorization)
             .header(WechatConstants.HEADER_ACCEPT, WechatConstants.ACCEPT_JSON)
             .header(WechatConstants.HEADER_USER_AGENT, WechatConstants.USER_AGENT);
-        LOG.info("Sending wechat refund query request...");
+        LOG.info("Sending query wechat refund state: {}", request.getRefundId());
         LOG.debug("Authorization: {}\n", authorization);
         HttpResult result = execute(httpRequest.GET().build());
         verifyHttpResult(result);
@@ -228,7 +228,7 @@ public class WechatDirectHttpClient extends WechatHttpClient {
         } else if (result.statusCode == 404) {
             throw new PaymentPipelineException(ErrorCode.OBJECT_NOT_FOUND, "发起微信退款查询失败: 退款单不存在");
         } else {
-            LOG.info("Wechat refund query failed: {}", result.statusCode);
+            LOG.error("Failed to send wechat refund state: {}\n{}", request.getRefundId(), result.responseText);
             ErrorMessage message = JsonUtils.fromJsonString(result.responseText, ErrorMessage.class);
             throw new PaymentPipelineException(ErrorCode.SYSTEM_UNKNOWN_ERROR, "微信退款查询失败: " + message.getMessage());
         }
@@ -164,18 +164,18 @@ public class WechatHttpClient extends ServiceEndpointSupport {
             .version(HttpClient.Version.HTTP_2).timeout(Duration.ofMillis(MAX_REQUEST_TIMEOUT_TIME))
             .header(CONTENT_TYPE, CONTENT_TYPE_JSON).header(WechatConstants.HEADER_ACCEPT, WechatConstants.ACCEPT_JSON)
             .header(WechatConstants.HEADER_USER_AGENT, WechatConstants.USER_AGENT);
-        LOG.info("Requesting MiniPro login authorization info: {}\n{}", code, uri);
+        LOG.info("Requesting wechat MiniPro login authorization info: {}\n{}", code, uri);
         HttpResult result = execute(request.GET().build());
         if (result.statusCode == 200) {
-            LOG.debug("MiniPro login authorization info response\n{}", result.responseText);
+            LOG.debug("Wechat MiniPro login authorization info response\n{}", result.responseText);
             AuthorizationSession session = JsonUtils.fromJsonString(result.responseText, AuthorizationSession.class);
             if (session.getErrcode() != null && session.getErrcode() != 0) {
-                LOG.error("Request MiniPro login authorization info failed: {}", session.getErrmsg());
+                LOG.error("Failed to request wechat MiniPro login authorization info: {}", session.getErrmsg());
                 throw new PaymentPipelineException(ErrorCode.SERVICE_ACCESS_ERROR, "获取小程序登录授权信息失败: " + session.getErrmsg());
             }
             return session.getOpenid();
         } else {
-            LOG.error("Request MiniPro login authorization info failed: {}", result.statusCode);
+            LOG.error("Failed to request wechat MiniPro login authorization info: {}", result.statusCode);
             throw new PaymentPipelineException(ErrorCode.SERVICE_ACCESS_ERROR, "获取小程序登录授权信息失败");
         }
     }
@@ -195,14 +195,14 @@ public class WechatHttpClient extends ServiceEndpointSupport {
         params.put("secret", appSecret);
         params.put("force_refresh", Boolean.FALSE);
         String payload = JsonUtils.toJsonString(params);
-        LOG.debug("Request MiniPro Api access token: {}", payload);
+        LOG.info("Requesting wechat MiniPro Api access token: {}", payload);
         HttpResult result = send(ACCESS_TOKEN_URL, payload);
         if (result.statusCode == 200) {
-            LOG.debug("MiniPro Api access token response: {}", result.responseText);
+            LOG.debug("Wechat MiniPro Api access token response: {}", result.responseText);
             Map<String, Object> data = JsonUtils.fromJsonString(result.responseText, new TypeReference<>() {});
             return WechatAccessToken.of((String)data.get("access_token"), (Integer) data.get("expires_in"));
         } else {
-            LOG.error("Request MiniPro Api access token failed: {}", result.statusCode);
+            LOG.error("Failed to request MiniPro Api access token: {}", result.statusCode);
             throw new PaymentPipelineException(ErrorCode.SERVICE_ACCESS_ERROR, "获取微信接口调用凭证失败");
         }
     }
@@ -234,7 +234,7 @@ public class WechatHttpClient extends ServiceEndpointSupport {
         params.put("payer", payer);
         String payload = JsonUtils.toJsonString(params);
-        LOG.debug("Request wechat upload shipping: {}", payload);
+        LOG.info("Requesting wechat upload shipping: {}", payload);
         HttpResult result = send(uri, payload);
         if (result.statusCode == 200) {
             LOG.debug("Wechat upload shipping response: {}", result.responseText);
@@ -245,7 +245,7 @@ public class WechatHttpClient extends ServiceEndpointSupport {
                 throw new PaymentPipelineException(ErrorCode.SERVICE_ACCESS_ERROR, "微信发货信息录入失败: " + errorMessage);
             }
         } else {
-            LOG.error("Request wechat upload shipping failed: {}", result.statusCode);
+            LOG.error("Failed to request wechat upload shipping: {}", result.statusCode);
             throw new PaymentPipelineException(ErrorCode.SERVICE_ACCESS_ERROR, "调用微信发货信息录入接口失败");
         }
     }
@@ -64,7 +64,7 @@ public class WechatPartnerHttpClient extends WechatHttpClient {
         headers[1] = HttpHeader.create(WechatConstants.HEADER_ACCEPT, WechatConstants.ACCEPT_JSON);
         headers[2] = HttpHeader.create(WechatConstants.HEADER_AUTHORIZATION, authorization);
-        LOG.info("Sending wechat native prepay request...");
+        LOG.info("Sending wechat native prepay request: {}", request.getPaymentId());
         LOG.debug("Authorization: {}\n{}", authorization, payload);
         HttpResult result = send(wechatBaseUri + NATIVE_PREPAY, headers, payload);
         verifyHttpResult(result);
@@ -72,7 +72,7 @@ public class WechatPartnerHttpClient extends WechatHttpClient {
             Map<String, Object> response = JsonUtils.fromJsonString(result.responseText, new TypeReference<>() {});
             return NativePrepayResponse.of(request.getPaymentId(), (String) response.get("code_url"));
         } else {
-            LOG.error("Wechat native prepay failed: {}\n{}", result.statusCode, result.responseText);
+            LOG.error("Failed to send wechat native prepay request: {}\n{}", request.getPaymentId(), result.responseText);
             ErrorMessage message = JsonUtils.fromJsonString(result.responseText, ErrorMessage.class);
             throw new PaymentPipelineException(ErrorCode.SYSTEM_UNKNOWN_ERROR, "发起微信预支付失败: " + message.getMessage());
         }
@@ -92,7 +92,7 @@ public class WechatPartnerHttpClient extends WechatHttpClient {
         headers[1] = HttpHeader.create(WechatConstants.HEADER_ACCEPT, WechatConstants.ACCEPT_JSON);
         headers[2] = HttpHeader.create(WechatConstants.HEADER_AUTHORIZATION, authorization);
-        LOG.info("Sending wechat JsApI prepay request...");
+        LOG.info("Sending wechat jsapi prepay request: {}", request.getPaymentId());
         LOG.debug("Authorization: {}\n{}", authorization, payload);
         HttpResult result = send(wechatBaseUri + JSAPI_PREPAY, headers, payload);
         verifyHttpResult(result);
@@ -100,7 +100,7 @@ public class WechatPartnerHttpClient extends WechatHttpClient {
             Map<String, Object> response = JsonUtils.fromJsonString(result.responseText, new TypeReference<>() {});
             return (String) response.get("prepay_id");
         } else {
-            LOG.error("Wechat JsApI prepay failed: {}\n{}", result.statusCode, result.responseText);
+            LOG.error("Failed to send wechat jsapi prepay request: {}\n{}", request.getPaymentId(), result.responseText);
             ErrorMessage message = JsonUtils.fromJsonString(result.responseText, ErrorMessage.class);
             throw new PaymentPipelineException(ErrorCode.SYSTEM_UNKNOWN_ERROR, "发起微信预支付失败: " + message.getMessage());
         }
@@ -110,12 +110,12 @@ public class WechatPartnerHttpClient extends WechatHttpClient {
      * 查询微信预支付订单状态
      */
     @Override
-    public OnlinePaymentResponse queryPrepayResponse(OnlinePrepayOrder order) throws Exception {
-        String subMchId = order.getString(Constants.PARAM_MCH_ID);
+    public OnlinePaymentResponse queryPrepayResponse(OnlinePrepayOrder request) throws Exception {
+        String subMchId = request.getString(Constants.PARAM_MCH_ID);
         AssertUtils.notEmpty(subMchId, "参数错误: 服务商模式下缺失子商户号");
         // 获取认证信息和签名信息
-        String uri = String.format(TRANSACTION_QUERY, order.getPaymentId(), wechatConfig.getMchId(), subMchId);
+        String uri = String.format(TRANSACTION_QUERY, request.getPaymentId(), wechatConfig.getMchId(), subMchId);
         String authorization = WechatSignatureUtils.authorization(wechatConfig.getMchId(), WechatConstants.HTTP_GET, uri,
             wechatConfig.getPrivateKey(), wechatConfig.getSerialNo());
@@ -124,7 +124,7 @@ public class WechatPartnerHttpClient extends WechatHttpClient {
             .header(CONTENT_TYPE, CONTENT_TYPE_JSON).header(WechatConstants.HEADER_AUTHORIZATION, authorization)
             .header(WechatConstants.HEADER_ACCEPT, WechatConstants.ACCEPT_JSON)
             .header(WechatConstants.HEADER_USER_AGENT, WechatConstants.USER_AGENT);
-        LOG.info("Sending wechat query merchant order request...");
+        LOG.info("Sending wechat query prepay order state request: {}", request.getPaymentId());
         LOG.debug("Authorization: {}\n", authorization);
         HttpResult result = execute(httpRequest.GET().build());
         verifyHttpResult(result);
@@ -138,7 +138,7 @@ public class WechatPartnerHttpClient extends WechatHttpClient {
             return new OnlinePaymentResponse((String) response.get("out_trade_no"), (String) response.get("transaction_id"),
                 OutPaymentType.WXPAY, openId, when, state, (String) response.get("trade_state_desc"));
         } else {
-            LOG.info("Wechat query transaction status failed: {}", result.statusCode);
+            LOG.error("Failed to query wechat prepay order state: {}\n{}", request.getPaymentId(), result.responseText);
             ErrorMessage message = JsonUtils.fromJsonString(result.responseText, ErrorMessage.class);
             throw new PaymentPipelineException(ErrorCode.SYSTEM_UNKNOWN_ERROR, "发起微信订单查询失败: " + message.getMessage());
         }
@@ -167,11 +167,11 @@ public class WechatPartnerHttpClient extends WechatHttpClient {
         headers[0] = HttpHeader.create(WechatConstants.HEADER_USER_AGENT, WechatConstants.USER_AGENT);
         headers[1] = HttpHeader.create(WechatConstants.HEADER_ACCEPT, WechatConstants.ACCEPT_JSON);
         headers[2] = HttpHeader.create(WechatConstants.HEADER_AUTHORIZATION, authorization);
-        LOG.info("Sending close wechat prepay order request...");
+        LOG.info("Sending close wechat prepay order request: {}", request.getPaymentId());
         LOG.debug("Authorization: {}\n{}", authorization, payload);
         HttpResult result = send(wechatBaseUri + uri, headers, payload);
         verifyHttpResult(result);
-        LOG.info("Close wechat prepay order statusCode: {}", result.statusCode);
+        LOG.error("Failed to close wechat prepay order: {}\n{}", request.getPaymentId(), result.responseText);
         if (result.statusCode != 200 && result.statusCode != 204) {
             ErrorMessage message = JsonUtils.fromJsonString(result.responseText, ErrorMessage.class);
             throw new PaymentPipelineException(ErrorCode.INVALID_OBJECT_STATE, "关闭微信订单失败: " + message.getMessage());
@@ -192,7 +192,7 @@ public class WechatPartnerHttpClient extends WechatHttpClient {
         headers[1] = HttpHeader.create(WechatConstants.HEADER_ACCEPT, WechatConstants.ACCEPT_JSON);
         headers[2] = HttpHeader.create(WechatConstants.HEADER_AUTHORIZATION, authorization);
-        LOG.info("Sending wechat payment refund request...");
+        LOG.info("Sending wechat payment refund request: {}", request.getPaymentId());
         LOG.debug("Authorization: {}\n{}", authorization, payload);
         HttpResult result = send(wechatBaseUri + NATIVE_REFUND, headers, payload);
         verifyHttpResult(result);
@@ -203,7 +203,7 @@ public class WechatPartnerHttpClient extends WechatHttpClient {
             return new OnlineRefundResponse((String) response.get("out_refund_no"), (String) response.get("refund_id"),
                 when, state, (String) response.get("status"));
         } else {
-            LOG.info("send wechat payment refund failed: {}", result.statusCode);
+            LOG.error("Failed to send wechat refund request: {}\n{}", request.getPaymentId(), result.responseText);
             ErrorMessage message = JsonUtils.fromJsonString(result.responseText, ErrorMessage.class);
             throw new PaymentPipelineException(ErrorCode.SYSTEM_UNKNOWN_ERROR, "发起微信退款失败: " + message.getMessage());
         }
@@ -226,7 +226,7 @@ public class WechatPartnerHttpClient extends WechatHttpClient {
             .header(CONTENT_TYPE, CONTENT_TYPE_JSON).header(WechatConstants.HEADER_AUTHORIZATION, authorization)
             .header(WechatConstants.HEADER_ACCEPT, WechatConstants.ACCEPT_JSON)
             .header(WechatConstants.HEADER_USER_AGENT, WechatConstants.USER_AGENT);
-        LOG.info("Sending wechat refund query request...");
+        LOG.info("Sending query wechat refund state: {}", request.getRefundId());
         LOG.debug("Authorization: {}\n", authorization);
         HttpResult result = execute(httpRequest.GET().build());
         verifyHttpResult(result);
@@ -239,7 +239,7 @@ public class WechatPartnerHttpClient extends WechatHttpClient {
         } else if (result.statusCode == 404) {
             throw new PaymentPipelineException(ErrorCode.OBJECT_NOT_FOUND, "发起微信退款查询失败: 退款单不存在");
         } else {
-            LOG.info("Wechat query mch refund failed: {}", result.statusCode);
+            LOG.error("Failed to send wechat refund state: {}\n{}", request.getRefundId(), result.responseText);
             ErrorMessage message = JsonUtils.fromJsonString(result.responseText, ErrorMessage.class);
             throw new PaymentPipelineException(ErrorCode.SYSTEM_UNKNOWN_ERROR, "微信退款查询失败: " + message.getMessage());
         }
@@ -13,12 +13,12 @@ public class UserCardDTO {
     // 持卡人名称
     private String name;
     // 卡余额
-    private String amount;
+    private Long amount;
     public UserCardDTO() {
     }
-    public UserCardDTO(Long customerId, Long accountId, String cardNo, String name, String amount) {
+    public UserCardDTO(Long customerId, Long accountId, String cardNo, String name, Long amount) {
         this.customerId = customerId;
         this.accountId = accountId;
         this.cardNo = cardNo;
@@ -58,11 +58,11 @@ public class UserCardDTO {
         this.name = name;
     }
-    public String getAmount() {
+    public Long getAmount() {
         return amount;
     }
-    public void setAmount(String amount) {
+    public void setAmount(Long amount) {
         this.amount = amount;
     }
 }
@@ -65,6 +65,7 @@ public class TradeAssistantServiceImpl implements ITradeAssistantService {
         List<OnlinePayment> onlinePayments = onlinePaymentDao.listOnlinePayments(trade.getTradeId(), TradeType.TRADE.getCode(), null);
         for (OnlinePayment payment : onlinePayments) {
             if (!PaymentState.isFinished(payment.getState())) {
+                LOG.info("Trying to close payment order in process: {}", payment.getPaymentId());
                 PaymentPipeline<?> pipeline = paymentPipelineManager.findPipelineById(payment.getPipelineId(), PaymentPipeline.class);
                 if (pipeline instanceof OnlinePipeline<?> onlinePipeline) {
                     // 理论上只存在一条支付中的支付记录，否则后面的支付通道关闭失败时，会回滚前面支付记录的状态修改