From 4a1be665036a0162cfeddc1a2633aa0a54053033 Mon Sep 17 00:00:00 2001 From: linfso Date: Fri, 20 Jun 2025 03:41:36 +0800 Subject: [PATCH] md --- .../erp/web/emis/EmisSettleBillController.java | 18 +++++++++++++----- .../xdadan/erp/emis/domain/EmisSettleBill.java | 2 ++ .../service/IEmisSettleBillPayLogService.java | 3 ++- .../impl/EmisSettleBillPayLogServiceImpl.java | 13 ++++--------- 4 files changed, 21 insertions(+), 15 deletions(-) diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java index da36c9d61..0b01e2f25 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java @@ -249,8 +249,8 @@ public class EmisSettleBillController extends BaseController public AjaxResult genWxPayFromWxApp(EmisSettleBill emisSettleBill) { try { - String qrPicUrl=emisSettleBillPayLogService.genWxPayFromWxApp(emisSettleBill.getSettleBillNo(),emisSettleBill.getOpenId()); - return AjaxResult.success("成功",qrPicUrl); + Map payObj=emisSettleBillPayLogService.genWxPayFromWxApp(emisSettleBill.getSettleBillNo(),emisSettleBill.getAppId(),emisSettleBill.getOpenId()); + return AjaxResult.success("成功",payObj); } catch (EmisBizError emisBizError) { emisBizError.printStackTrace(); return AjaxResult.error(emisBizError.getMessage()); @@ -261,9 +261,17 @@ public class EmisSettleBillController extends BaseController @PostMapping(value = "/sumbitWxPay") public AjaxResult sumbitWxPay(@RequestBody EmisSettleBill emisSettleBill) { - String customerCode=emisSettleBill.getCustomerCode(); - emisSettleBill.setCustomerCode(customerCode); - return AjaxResult.success("123"); +// String customerCode=emisSettleBill.getCustomerCode(); +// emisSettleBill.setCustomerCode(customerCode); +// return AjaxResult.success("123"); + + try { + Map payObj=emisSettleBillPayLogService.genWxPayFromWxApp(emisSettleBill.getSettleBillNo(),emisSettleBill.getAppId(),emisSettleBill.getOpenId()); + return AjaxResult.success("成功",payObj); + } catch (EmisBizError emisBizError) { + emisBizError.printStackTrace(); + return AjaxResult.error(emisBizError.getMessage()); + } } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleBill.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleBill.java index 6ff417dc7..f221ebbd0 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleBill.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleBill.java @@ -195,6 +195,8 @@ public class EmisSettleBill extends BaseEntity private String qrCodePayPicUrl; // 支付人openId private String openId; + // appId + private String appId; List subBillList; 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 c69d156f9..3d4688a2d 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 @@ -10,6 +10,7 @@ package com.xdadan.erp.emis.service; import java.util.List; +import java.util.Map; import com.xdadan.erp.common.core.domain.AjaxResult; import com.xdadan.erp.emis.domain.EmisSettleBillPayLog; @@ -94,7 +95,7 @@ public interface IEmisSettleBillPayLogService * @return * @throws EmisBizError */ - public String genWxPayFromWxApp(String settleBillNo,String appId,String openId) throws EmisBizError; + public Map 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 d8e77e979..77484ebb7 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 @@ -12,11 +12,9 @@ package com.xdadan.erp.emis.service.impl; import java.io.IOException; import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; +import cn.hutool.crypto.SignUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.xdadan.erp.common.core.domain.AjaxResult; @@ -236,7 +234,7 @@ public class EmisSettleBillPayLogServiceImpl implements IEmisSettleBillPayLogSer * @throws EmisBizError */ @Override - public String genWxPayFromWxApp(String settleBillNo,String appId,String openId) throws EmisBizError { + public Map genWxPayFromWxApp(String settleBillNo,String appId,String openId) throws EmisBizError { EmisSettleBill emisSettleBill=emisSettleBillMapper.selectSettleBillBySettleBillNo(settleBillNo); @@ -280,14 +278,11 @@ public class EmisSettleBillPayLogServiceImpl implements IEmisSettleBillPayLogSer log.info("支付代码生成==>{}",JSONObject.toJSONString(res)); emisSettleBillPayLogUpd.setResponseExtra(JSON.toJSONString(res)); if(res.isSuccess()){ - 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 prepayId; + return (Map)res.getData().get("credential"); } else{ emisSettleBillPayLogUpd.setStatus(40);