From b82e78ceb8f52b05203f05eb4b14151b1ab408a2 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期三, 24 十二月 2025 18:52:23 +0800
Subject: [PATCH] feat:下单功能联调及短信对接
---
ruoyi-system/src/main/java/com/ruoyi/system/utils/ICBCPayUtil.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/utils/ICBCPayUtil.java b/ruoyi-system/src/main/java/com/ruoyi/system/utils/ICBCPayUtil.java
index 393e7d2..9fbf9b3 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/utils/ICBCPayUtil.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/utils/ICBCPayUtil.java
@@ -13,6 +13,7 @@
import com.ruoyi.system.config.ICBCConfig;
import com.ruoyi.system.enums.ICBCRespOrderErrorEnum;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -25,11 +26,11 @@
@Autowired
private ICBCConfig icbcConfig;
- public JSONObject wechatPay(String outTradeNo, BigDecimal totalPrice, String goodsName,String openid, String notifyUrl){
+ public JSONObject wechatPay(String outTradeNo, BigDecimal totalPrice, String goodsName,String openid, String notifyUrl, String merId, String merPrtclNo){
CardbusinessAggregatepayB2cOnlineConsumepurchaseRequestV1.CardbusinessAggregatepayB2cOnlineConsumepurchaseRequestV1Biz bizContent = new
CardbusinessAggregatepayB2cOnlineConsumepurchaseRequestV1.CardbusinessAggregatepayB2cOnlineConsumepurchaseRequestV1Biz();
- bizContent.setMer_id(icbcConfig.getMerId());
- bizContent.setMer_prtcl_no(icbcConfig.getMerPrtclNo());
+ bizContent.setMer_id(StringUtils.isBlank(merId) ? icbcConfig.getMerId() : merId);
+ bizContent.setMer_prtcl_no(StringUtils.isBlank(merPrtclNo) ? icbcConfig.getMerPrtclNo() : merPrtclNo);
bizContent.setDecive_info(icbcConfig.getDeciveInfo());
bizContent.setOut_trade_no(outTradeNo);
bizContent.setOrig_date_time(DateUtils.getCurrentDateTimeWithT());
--
Gitblit v1.7.1