upgrade after testing

huanggang
1 parent c09450ac
Showing 4 changed files with 82 additions and 38 deletions
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/client/CardPaymentHttpClient.java
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/core/WechatDirectPipeline.java
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/core/WechatPartnerPipeline.java
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/core/WechatPipeline.java
@@ -69,12 +69,18 @@ public class CardPaymentHttpClient extends ServiceEndpointSupport {
         HttpResult result = send(uri, payload);
         if (result.statusCode == 200) {
             LOG.debug("Received from card payment pipeline: {}", result.responseText);
-            Map<String, Object> response = JsonUtils.fromJsonString(result.responseText, new TypeReference<>() {});
+            Map<String, Object> response = JsonUtils.fromJsonString(result.responseText, new TypeReference<>() {
+            });
             if ("200".equals(response.get("code"))) {
-                String outTradeNo = (String) response.get("data");
-                return new CardPaymentResponse(request.getPaymentId(), outTradeNo,
-                    OutPaymentType.DILICARD, String.valueOf(request.getAccountId()), now,
-                    PaymentState.SUCCESS, "园区卡支付成功");
+                Map<String, Object> data = (Map<String, Object>) response.get("data");
+                String outTradeNo = (String) data.get("outTradeNo");
+                Map<String, Object> payerId = new LinkedHashMap<>();
+                payerId.put("customerId", convertLong(data.get("customerId")));
+                payerId.put("accountId", convertLong(data.get("accountId")));
+                payerId.put("cardNo", data.get("cardNo"));
+                payerId.put("name", data.get("name"));
+                return new CardPaymentResponse(request.getPaymentId(), outTradeNo, OutPaymentType.DILICARD,
+                        JsonUtils.toJsonString(payerId), now, PaymentState.SUCCESS, "园区卡支付成功");
             } else {
                 throw new PaymentPipelineException(ErrorCode.SERVICE_ACCESS_ERROR, "园区卡支付失败: " + response.get("message"));
             }
@@ -95,10 +101,11 @@ public class CardPaymentHttpClient extends ServiceEndpointSupport {
         HttpResult result = send(uri, payload);
         if (result.statusCode == 200) {
             LOG.debug("Received from card payment pipeline: {}", result.responseText);
-            Map<String, Object> response = JsonUtils.fromJsonString(result.responseText, new TypeReference<>() {});
+            Map<String, Object> response = JsonUtils.fromJsonString(result.responseText, new TypeReference<>() {
+            });
             if ("200".equals(response.get("code"))) {
                 return new OnlineRefundResponse(request.getRefundId(), null, now,
-                    PaymentState.SUCCESS, "园区卡退款成功");
+                        PaymentState.SUCCESS, "园区卡退款成功");
             } else {
                 throw new PaymentPipelineException(ErrorCode.SERVICE_ACCESS_ERROR, "园区卡支付退款失败: " + response.get("message"));
             }
@@ -117,16 +124,18 @@ public class CardPaymentHttpClient extends ServiceEndpointSupport {
         HttpResult result = send(uri, payload);
         if (result.statusCode == 200) {
             LOG.debug("Received from card payment pipeline: {}", result.responseText);
-            Map<String, Object> response = JsonUtils.fromJsonString(result.responseText, new TypeReference<>() {});
+            Map<String, Object> response = JsonUtils.fromJsonString(result.responseText, new TypeReference<>() {
+            });
             if ("200".equals(response.get("code"))) {
                 List<UserCardDTO> userCards = new ArrayList<>();
                 Object data = response.get("data");
                 if (data != null) {
-                    List<Map<String, Object>> cardList = JsonUtils.convertValue(data, new TypeReference<>() {});
+                    List<Map<String, Object>> cardList = JsonUtils.convertValue(data, new TypeReference<>() {
+                    });
                     for (Map<String, Object> card : cardList) {
                         UserCardDTO userCard = new UserCardDTO(convertLong(card.get("customerId")),
-                            convertLong(card.get("accountId")), (String) card.get("cardNo"),
-                            (String) card.get("customerName"), convertLong(card.get("amount")));
+                                convertLong(card.get("accountId")), (String) card.get("cardNo"),
+                                (String) card.get("customerName"), convertLong(card.get("amount")));
                         userCards.add(userCard);
                     }
                 }
@@ -142,4 +151,4 @@ public class CardPaymentHttpClient extends ServiceEndpointSupport {
     private Long convertLong(Object value) {
         return value != null ? ((Number) value).longValue() : null;
     }
 -}
+}
 \ No newline at end of file
@@ -4,7 +4,14 @@ import com.diligrp.cashier.pipeline.Constants;
 import com.diligrp.cashier.pipeline.client.WechatDirectHttpClient;
 import com.diligrp.cashier.pipeline.client.WechatHttpClient;
 import com.diligrp.cashier.pipeline.domain.*;
+import com.diligrp.cashier.pipeline.exception.PaymentPipelineException;
+import com.diligrp.cashier.pipeline.util.WechatConstants;
+import com.diligrp.cashier.pipeline.util.WechatSignatureUtils;
+import com.diligrp.cashier.shared.ErrorCode;
 import com.diligrp.cashier.shared.util.AssertUtils;
+import com.diligrp.cashier.shared.util.RandomUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 /**
  * 微信支付通道抽象模型-直联模式
@@ -13,6 +20,9 @@ import com.diligrp.cashier.shared.util.AssertUtils;
  * upay_wechat_param需配置商户API接口所需配置信息
  */
 public class WechatDirectPipeline extends WechatPipeline<WechatDirectPipeline.DirectWechatParams> {
+
+    private static final Logger LOG = LoggerFactory.getLogger(WechatDirectPipeline.class);
+
     private final ScanTimeStrategy strategy;
     // 直联模式下的微信客户端
@@ -41,11 +51,27 @@ public class WechatDirectPipeline extends WechatPipeline&lt;WechatDirectPipeline.Di
         return super.sendNativePrepayRequest(request);
     }
-    @Override
     public MiniProPrepayResponse sendMiniProPrepayRequest(MiniProPrepayRequest request) {
-        // 直连模式下，外部商户号设置为微信商户号
-        request.put(Constants.PARAM_MCH_ID, wechatConfig.getMchId());
-        return super.sendMiniProPrepayRequest(request);
+        try {
+            // 直连模式下，外部商户号设置为微信商户号
+            request.put(Constants.PARAM_MCH_ID, wechatConfig.getMchId());
+            String notifyUri = String.format(Constants.WECHAT_PAYMENT_NOTIFY_URI, params().getNotifyUrl(), request.getPaymentId());
+            String prepayId = getClient().sendMiniProPrepayRequest(request, notifyUri);
+
+            String timeStamp = String.valueOf(System.currentTimeMillis() / 1000);
+            String nonceStr = RandomUtils.randomString(32);
+            String packet = "prepay_id=" + prepayId;
+            String appId = getClient().getWechatConfig().getAppId();
+            String message = String.format("%s\n%s\n%s\n%s\n", appId, timeStamp, nonceStr, packet);
+            String paySign = WechatSignatureUtils.signature(message, getClient().getWechatConfig().getPrivateKey());
+            String signType = WechatConstants.RSA_ALGORITHM;
+            return MiniProPrepayResponse.of(request.getPaymentId(), prepayId, prepayId, timeStamp, nonceStr, signType, paySign);
+        } catch (PaymentPipelineException | IllegalArgumentException pse) {
+            throw pse;
+        } catch (Exception ex) {
+            LOG.error("Send wechat mini pro prepay request exception", ex);
+            throw new PaymentPipelineException(ErrorCode.SYSTEM_UNKNOWN_ERROR, "发起微信预支付失败");
+        }
     }
     @Override
@@ -4,7 +4,14 @@ import com.diligrp.cashier.pipeline.Constants;
 import com.diligrp.cashier.pipeline.client.WechatHttpClient;
 import com.diligrp.cashier.pipeline.client.WechatPartnerHttpClient;
 import com.diligrp.cashier.pipeline.domain.*;
+import com.diligrp.cashier.pipeline.exception.PaymentPipelineException;
+import com.diligrp.cashier.pipeline.util.WechatConstants;
+import com.diligrp.cashier.pipeline.util.WechatSignatureUtils;
+import com.diligrp.cashier.shared.ErrorCode;
 import com.diligrp.cashier.shared.util.AssertUtils;
+import com.diligrp.cashier.shared.util.RandomUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 /**
  * 微信支付通道抽象模型-服务商模式
@@ -15,6 +22,8 @@ import com.diligrp.cashier.shared.util.AssertUtils;
  */
 public class WechatPartnerPipeline extends WechatPipeline<WechatPartnerPipeline.PartnerWechatParams> {
+    private static final Logger LOG = LoggerFactory.getLogger(WechatPartnerPipeline.class);
+
     private final ScanTimeStrategy strategy;
     // 服务商模式下的微信客户端
@@ -49,9 +58,27 @@ public class WechatPartnerPipeline extends WechatPipeline&lt;WechatPartnerPipeline.
     @Override
     public MiniProPrepayResponse sendMiniProPrepayRequest(MiniProPrepayRequest request) {
-        // 服务商模式下，外部商户号默认设置为特约子商户
-        request.put(Constants.PARAM_MCH_ID, params().getSubMchId());
-        return super.sendMiniProPrepayRequest(request);
+        try {
+            // 服务商模式下，外部商户号默认设置为特约子商户
+            PartnerWechatParams params = params();
+            request.put(Constants.PARAM_MCH_ID, params.getSubMchId());
+            String notifyUri = String.format(Constants.WECHAT_PAYMENT_NOTIFY_URI, params.getNotifyUrl(), request.getPaymentId());
+            String prepayId = getClient().sendMiniProPrepayRequest(request, notifyUri);
+
+            String timeStamp = String.valueOf(System.currentTimeMillis() / 1000);
+            String nonceStr = RandomUtils.randomString(32);
+            String packet = "prepay_id=" + prepayId;
+            String message = String.format("%s\n%s\n%s\n%s\n", params.getSubAppId(), timeStamp, nonceStr, packet);
+            // 签名时需要使用配置的subAppId
+            String paySign = WechatSignatureUtils.signature(message, getClient().getWechatConfig().getPrivateKey());
+            String signType = WechatConstants.RSA_ALGORITHM;
+            return MiniProPrepayResponse.of(request.getPaymentId(), prepayId, prepayId, timeStamp, nonceStr, signType, paySign);
+        } catch (PaymentPipelineException | IllegalArgumentException pse) {
+            throw pse;
+        } catch (Exception ex) {
+            LOG.error("Send wechat mini pro prepay request exception", ex);
+            throw new PaymentPipelineException(ErrorCode.SYSTEM_UNKNOWN_ERROR, "发起微信预支付失败");
+        }
     }
     @Override
@@ -8,11 +8,9 @@ import com.diligrp.cashier.pipeline.domain.wechat.WechatConfig;
 import com.diligrp.cashier.pipeline.exception.PaymentPipelineException;
 import com.diligrp.cashier.pipeline.type.ChannelType;
 import com.diligrp.cashier.pipeline.util.WechatConstants;
-import com.diligrp.cashier.pipeline.util.WechatSignatureUtils;
 import com.diligrp.cashier.shared.ErrorCode;
 import com.diligrp.cashier.shared.security.RsaCipher;
 import com.diligrp.cashier.shared.util.AssertUtils;
-import com.diligrp.cashier.shared.util.RandomUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -100,24 +98,7 @@ public abstract class WechatPipeline&lt;T extends WechatPipeline.WechatParams&gt; exte
      * 小程序预支付下单
      */
     public MiniProPrepayResponse sendMiniProPrepayRequest(MiniProPrepayRequest request) {
-        try {
-            String notifyUri = String.format(Constants.WECHAT_PAYMENT_NOTIFY_URI, params().getNotifyUrl(), request.getPaymentId());
-            String prepayId = getClient().sendMiniProPrepayRequest(request, notifyUri);
-
-            String timeStamp = String.valueOf(System.currentTimeMillis() / 1000);
-            String nonceStr = RandomUtils.randomString(32);
-            String packet = "prepay_id=" + prepayId;
-            String appId = getClient().getWechatConfig().getAppId();
-            String message = String.format("%s\n%s\n%s\n%s\n", appId, timeStamp, nonceStr, packet);
-            String paySign = WechatSignatureUtils.signature(message, getClient().getWechatConfig().getPrivateKey());
-            String signType = WechatConstants.RSA_ALGORITHM;
-            return MiniProPrepayResponse.of(request.getPaymentId(), prepayId, prepayId, timeStamp, nonceStr, signType, paySign);
-        } catch (PaymentPipelineException | IllegalArgumentException pse) {
-            throw pse;
-        } catch (Exception ex) {
-            LOG.error("Send wechat mini pro prepay request exception", ex);
-            throw new PaymentPipelineException(ErrorCode.SYSTEM_UNKNOWN_ERROR, "发起微信预支付失败");
-        }
+        return super.sendMiniProPrepayRequest(request);
     }
     /**