feat:下单功能联调及短信对接

“mitao”

2025-12-24 b82e78ceb8f52b05203f05eb4b14151b1ab408a2

 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());