aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2025-06-19 18:42:25 +08:00
parent 6a626af581
commit ee31ebefec
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleBillPayLogService.java
View File

@ -94,7 +94,7 @@ public interface IEmisSettleBillPayLogService
* @return * @return
* @throws EmisBizError * @throws EmisBizError
*/ */
public String genWxPayFromWxApp(String settleBillNo,String openId) throws EmisBizError; public String genWxPayFromWxApp(String settleBillNo,String appId,String openId) throws EmisBizError;
/** /**

8
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillPayLogServiceImpl.java
View File

@ -236,7 +236,7 @@ public class EmisSettleBillPayLogServiceImpl implements IEmisSettleBillPayLogSer
* @throws EmisBizError * @throws EmisBizError
*/ */
@Override @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); EmisSettleBill emisSettleBill=emisSettleBillMapper.selectSettleBillBySettleBillNo(settleBillNo);
@ -269,7 +269,7 @@ public class EmisSettleBillPayLogServiceImpl implements IEmisSettleBillPayLogSer
// 公众号及小程序支付 // 公众号及小程序支付
String channel="wxpay_pub"; String channel="wxpay_pub";
String appId=""; // String appId="";
String notifyUrl= Config.ERP_API_PAY_NOTIFY_URL; String notifyUrl= Config.ERP_API_PAY_NOTIFY_URL;
ApiRes res= null; ApiRes res= null;
@ -280,14 +280,14 @@ public class EmisSettleBillPayLogServiceImpl implements IEmisSettleBillPayLogSer
log.info("支付代码生成==>{}",JSONObject.toJSONString(res)); log.info("支付代码生成==>{}",JSONObject.toJSONString(res));
emisSettleBillPayLogUpd.setResponseExtra(JSON.toJSONString(res)); emisSettleBillPayLogUpd.setResponseExtra(JSON.toJSONString(res));
if(res.isSuccess()){ 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.setCredential(JSON.toJSONString(res.getData().get("credential")));
emisSettleBillPayLogUpd.setStatus(10); emisSettleBillPayLogUpd.setStatus(10);
emisSettleBillPayLogUpd.setStatusDesc("支付中"); emisSettleBillPayLogUpd.setStatusDesc("支付中");
emisSettleBillPayLogMapper.updateEmisSettleBillPayLog(emisSettleBillPayLogUpd); emisSettleBillPayLogMapper.updateEmisSettleBillPayLog(emisSettleBillPayLogUpd);
return payCode; return prepayId;
} }
else{ else{
emisSettleBillPayLogUpd.setStatus(40); emisSettleBillPayLogUpd.setStatus(40);