From ee31ebefec20888255488b7ed1e5eb4a45c9945f Mon Sep 17 00:00:00 2001 From: linfso Date: Thu, 19 Jun 2025 18:42:25 +0800 Subject: [PATCH] md --- .../erp/emis/service/IEmisSettleBillPayLogService.java | 2 +- .../service/impl/EmisSettleBillPayLogServiceImpl.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleBillPayLogService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleBillPayLogService.java index ddd1127c6..c69d156f9 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleBillPayLogService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleBillPayLogService.java @@ -94,7 +94,7 @@ public interface IEmisSettleBillPayLogService * @return * @throws EmisBizError */ - public String genWxPayFromWxApp(String settleBillNo,String openId) throws EmisBizError; + public String genWxPayFromWxApp(String settleBillNo,String appId,String openId) throws EmisBizError; /** diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillPayLogServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillPayLogServiceImpl.java index 8bd03596e..d8e77e979 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillPayLogServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillPayLogServiceImpl.java @@ -236,7 +236,7 @@ public class EmisSettleBillPayLogServiceImpl implements IEmisSettleBillPayLogSer * @throws EmisBizError */ @Override - public String genWxPayFromWxApp(String settleBillNo,String openId) throws EmisBizError { + public String genWxPayFromWxApp(String settleBillNo,String appId,String openId) throws EmisBizError { EmisSettleBill emisSettleBill=emisSettleBillMapper.selectSettleBillBySettleBillNo(settleBillNo); @@ -269,7 +269,7 @@ public class EmisSettleBillPayLogServiceImpl implements IEmisSettleBillPayLogSer // 公众号及小程序支付 String channel="wxpay_pub"; - String appId=""; +// String appId=""; String notifyUrl= Config.ERP_API_PAY_NOTIFY_URL; ApiRes res= null; @@ -280,14 +280,14 @@ public class EmisSettleBillPayLogServiceImpl implements IEmisSettleBillPayLogSer log.info("支付代码生成==>{}",JSONObject.toJSONString(res)); emisSettleBillPayLogUpd.setResponseExtra(JSON.toJSONString(res)); if(res.isSuccess()){ - String payCode=((Map)res.getData().get("credential")).get("qr_image_url").toString(); + String prepayId=((Map)res.getData().get("credential")).get("prepay_id").toString(); emisSettleBillPayLogUpd.setCredential(JSON.toJSONString(res.getData().get("credential"))); emisSettleBillPayLogUpd.setStatus(10); emisSettleBillPayLogUpd.setStatusDesc("支付中"); emisSettleBillPayLogMapper.updateEmisSettleBillPayLog(emisSettleBillPayLogUpd); - return payCode; + return prepayId; } else{ emisSettleBillPayLogUpd.setStatus(40);